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

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Closed
Merge request !356 opened Jan 11, 2016 by Czémán Arnold@cemiarni 
  • Report abuse
Report abuse

Update setty branch

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b master origin/master

Step 2. Review the changes locally

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

git checkout feature-setty
git merge --no-ff master

Step 4. Push the result of the merge to GitLab

git push origin feature-setty

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

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

  • Discussion 4
  • Commits 43
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kálmán Viktor
    @kviktor started a discussion on commit ecbe7ac8 Jul 29, 2015
    Last updated by Bach Dániel Jul 29, 2015
    • Kálmán Viktor @kviktor commented Jul 29, 2015
      Owner

      pretty fly for a white guy 👸 ✈ 4️⃣ 🅰 ◻ 👨

      Edited Jul 29, 2015
      pretty fly for a white guy :princess: :airplane: :four: :a: :white_medium_square: :man:
    • Bach Dániel @bachdaniel commented Jul 29, 2015
      Owner

      XD

      ![XD](http://orig12.deviantart.net/3fdb/f/2012/040/5/c/laika_boss_by_littlekudryavka-d4p4ndi.jpg)
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on commit 5bb8d0d9 Jul 30, 2015
    circle/firewall/management/commands/reload_firewall.py
    23 23  
    24 24  
    25 25 class Command(BaseCommand):
    26
    27 def add_arguments(self, parser):
    28
    29 parser.add_argument('--sync',
    30 action='store_const',
    31 dest='sync',
    32 const=True,
    33 default=False,
    34 help='Delete poll instead of closing it')
    • Kálmán Viktor @kviktor commented Jul 30, 2015
      Owner

      💻 🐕

      :computer: :dog2:
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on commit 19ef112c Sep 04, 2015
    circle/locale/hu/LC_MESSAGES/django.po
    7140
    7141 #~ msgid "Templates box"
    7142 #~ msgstr "Sablonok"
    7143
    7144 #~ msgid "How can I expand the VM’s expiration date?"
    7145 #~ msgstr "Hogyan tudom növelni a VM lejárati idejét?"
    7146
    7147 #~ msgid "File management"
    7148 #~ msgstr "Fájlkezelés"
    7149
    7150 #~ msgid "How can I give the template to other user?"
    7151 #~ msgstr "Hogyan tudom egy másik felhasználónak adni a sablont?"
    7152
    7153 #~ msgid "How can I give access to users or groups to the template?"
    7154 #~ msgstr ""
    7155 #~ "Hogyan tudok a sablonhoz hozzáférést adni a felhasználóknak vagy "
    • Kálmán Viktor @kviktor commented Sep 04, 2015
      Owner

      -a

      -a
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on commit 6116601b Sep 15, 2015
    • Kálmán Viktor @kviktor

      mentioned in commit 0282e224

      Sep 15, 2015

      mentioned in commit 0282e224

      mentioned in commit 0282e2244844d7e9064849bc746827cb28d0323c
      Toggle commit list
    Please register or sign in to reply
  • Kálmán Viktor @kviktor

    Status changed to closed

    Jan 11, 2016

    Status changed to closed

    Status changed to closed
    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
Estók Dániel
Assignee
Estók Dániel @estok.daniel
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: circle/cloud!356