Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

RECIRCLE / portal

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 11
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !20 opened Oct 03, 2019 by Belákovics Ádám@Edi 
  • Report abuse
Report abuse

Api changes

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b api_changes origin/api_changes

Step 2. Review the changes locally

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

git checkout DEV
git merge --no-ff api_changes

Step 4. Push the result of the merge to GitLab

git push origin DEV

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

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

  • Discussion 1
  • Commits 3
  • Pipelines 2
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Belákovics Ádám
    @Edi started a discussion on the diff Oct 03, 2019
    Resolved by Belákovics Ádám Oct 03, 2019
    recircle/instance/views.py
    56 56 except Instance.DoesNotExist:
    57 57 raise Http404
    58 58
    59 def get_merged_object(self, pk):
    • Belákovics Ádám @Edi commented Oct 03, 2019
      Owner

      Nekem nem tetszik, hogy ez itt van azonos szinten mint a végpontok. És a neve is rossz.

      Nekem nem tetszik, hogy ez itt van azonos szinten mint a végpontok. És a neve is rossz.
    Please register or sign in to reply
  • Belákovics Ádám @Edi

    added 1 commit

    • 94f951c4 - Add handling template to create

    Compare with previous version

    Oct 03, 2019

    added 1 commit

    • 94f951c4 - Add handling template to create

    Compare with previous version

    added 1 commit * 94f951c4 - Add handling template to create [Compare with previous version](https://git.ik.bme.hu/RECIRCLE/portal/merge_requests/20/diffs?diff_id=882&start_sha=256a2690f92f68602f015b9c01640b8ef0f01d0a)
    Toggle commit list
  • Belákovics Ádám @Edi

    resolved all discussions

    Oct 03, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Belákovics Ádám @Edi

    merged

    Oct 10, 2019

    merged

    merged
    Toggle commit list
  • Belákovics Ádám @Edi

    mentioned in commit 70bd9c63

    Oct 10, 2019

    mentioned in commit 70bd9c63

    mentioned in commit 70bd9c630df0630613224e3f9756b3232ca65b20
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Belákovics Ádám
Assignee
Belákovics Ádám @Edi
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: RECIRCLE/portal!20
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.