Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
est
est
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 9
    • Issues 9
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Jira
    • Jira
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • workflow
  • estest
  • Merge Requests
  • !24

Closed
Opened Mar 12, 2020 by Mauro Rovezzi@rovezzi
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.esrf.fr/rovezzi/est.git" "mauro_evals"
git checkout -b "rovezzi/est-mauro_evals" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "rovezzi/est-mauro_evals"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

[xas_input] Bug fixes and cleaning while evaluation

  • Overview 0
  • Commits 14
  • Pipelines 7
  • Changes 9

@payno I have done a fist (quick and dirty) evaluation of the "xas_input" step in est. The changes here are minor, mainly code cleaning/formatting according to flake8 (linter) and black (formatter). This can be reviewed and eventually merged now. To go further in the evaluation we may need to further discuss on the design of the widgets.

Edited Mar 18, 2020 by Mauro Rovezzi
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: workflow/est!24