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
Merged
Merge request !395 opened Jul 08, 2017 by Czémán Arnold@cemiarni 
  • Report abuse
Report abuse

Upgrade to Django 1.11

Issue: #494 (closed)

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b issue_494 origin/issue_494

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff issue_494

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.

  • Discussion 0
  • Commits 19
  • Pipelines 8
  • Changes 44
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Czémán Arnold @cemiarni

    added 1 commit

    • 0df88258 - dashboard: remove an unused import

    Compare with previous version

    Jul 07, 2017

    added 1 commit

    • 0df88258 - dashboard: remove an unused import

    Compare with previous version

    added 1 commit * 0df88258 - dashboard: remove an unused import [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/395/diffs?diff_id=632&start_sha=8f517a774a24061d7eb769a54ccdbb0045d010ec)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • 17eb0448 - Add python-memcached requirement

    Compare with previous version

    Oct 04, 2017

    added 1 commit

    • 17eb0448 - Add python-memcached requirement

    Compare with previous version

    added 1 commit * 17eb0448 - Add python-memcached requirement [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/395/diffs?diff_id=646&start_sha=0df882582cea4dcb5bc6f5ee3ba69fcd1bdf0821)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 3 commits

    • ef5501a6 - dashboard: eleminate RequestContext from vm_activity view
    • 2511d461 - Fix flake8 warnings
    • cbcc6adc - Merge branch 'issue_494' of https://git.ik.bme.hu/circle/cloud into issue_494

    Compare with previous version

    Oct 04, 2017

    added 3 commits

    • ef5501a6 - dashboard: eleminate RequestContext from vm_activity view
    • 2511d461 - Fix flake8 warnings
    • cbcc6adc - Merge branch 'issue_494' of https://git.ik.bme.hu/circle/cloud into issue_494

    Compare with previous version

    added 3 commits * ef5501a6 - dashboard: eleminate RequestContext from vm_activity view * 2511d461 - Fix flake8 warnings * cbcc6adc - Merge branch 'issue_494' of https://git.ik.bme.hu/circle/cloud into issue_494 [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/395/diffs?diff_id=647&start_sha=17eb044837903fc344f359ad31abc73ace04553d)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • 98e0ef2b - settings: fix flake8 exception in selenium test settings

    Compare with previous version

    Oct 04, 2017

    added 1 commit

    • 98e0ef2b - settings: fix flake8 exception in selenium test settings

    Compare with previous version

    added 1 commit * 98e0ef2b - settings: fix flake8 exception in selenium test settings [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/395/diffs?diff_id=648&start_sha=cbcc6adc134c3dea3da799a57c431a628872c03b)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • df34da69 - dashboard, requests: eleminate more RequestContexts

    Compare with previous version

    Oct 04, 2017

    added 1 commit

    • df34da69 - dashboard, requests: eleminate more RequestContexts

    Compare with previous version

    added 1 commit * df34da69 - dashboard, requests: eleminate more RequestContexts [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/395/diffs?diff_id=649&start_sha=98e0ef2bfbe623fb6033df89d74ea9375f3ad253)
    Toggle commit list
  • Czémán Arnold @cemiarni

    merged

    Oct 04, 2017

    merged

    merged
    Toggle commit list
  • Czémán Arnold @cemiarni

    mentioned in commit 53dbd80b

    Oct 04, 2017

    mentioned in commit 53dbd80b

    mentioned in commit 53dbd80b3200f6a04a08f15ae48c6dceb575d502
    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
Czémán Arnold
Assignee
Czémán Arnold @cemiarni
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
critical
Assign labels
  • View labels
1
1 participant
Reference: circle/cloud!395
×

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.