summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-063-0/+11
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-0319-30/+82
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-253-10/+32
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-2013-35/+65
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-186-49/+15
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-6/+1
| | * | | | | | | | | | | Check the discussion lock only for issuables & clean styleJarka Kadlecova2017-09-141-1/+1
| | * | | | | | | | | | | Support discussion locking in the backendJarka Kadlecova2017-09-143-0/+16
| * | | | | | | | | | | | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'ma...Douwe Maan2017-10-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Render GPG subkeys on index pageRubén Dávila2017-10-051-1/+1
* | | | | | | | | | | | | Fixed default group sort optiongroup-sort-dropdown-blankPhil Hughes2017-10-061-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-051-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Test against public projectsZeger-Jan van de Weg2017-10-051-1/+1
| * | | | | | | | | | | | Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-048-23/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Redirect to pages daemonZeger-Jan van de Weg2017-10-031-7/+11
* | | | | | | | | | | | | Merge branch 'save-a-query-on-todos-with-no-filters' into 'master'Yorick Peterse2017-10-051-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Save a query on the todos index pagesave-a-query-on-todos-with-no-filtersSean McGivern2017-10-041-4/+26
* | | | | | | | | | | | | Merge branch 'backport_from_EE' into 'master'Rémy Coutable2017-10-051-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Minor backport from EEbackport_from_EEValery Sizov2017-10-051-3/+1
* | | | | | | | | | | | | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-0528-75/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'sh-fix-username-logging' into 'master'Sean McGivern2017-10-052-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix username and ID not logging in production_json.log for Git activitysh-fix-username-loggingStan Hu2017-10-042-3/+13
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '26890-fix-default-branches-sorting' into 'master'Robert Speicher2017-10-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sortingRémy Coutable2017-09-251-1/+1
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'dm-pat-revoke' into 'master'Sean McGivern2017-10-041-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Set default scope on PATs that don't have one set to allow them to be revokeddm-pat-revokeDouwe Maan2017-10-031-1/+1
| * | | | | | | | | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-12/+36
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add serializer matchersKamil Trzcinski2017-10-021-7/+7
| | * | | | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-2814-27/+49
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-262-8/+24
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into 31050-registry-image-listsFilipa Lacerda2017-09-2212-33/+69
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add ContainerTag and ContainerRepository frontend APIKamil Trzcinski2017-09-212-48/+27
| | * | | | | | | | | | | | [ci skip] Adds tests to vuex and collapsibe componentFilipa Lacerda2017-09-201-7/+21
| | * | | | | | | | | | | | [ci skip] First iteration: port haml into vueFilipa Lacerda2017-09-191-0/+31
| * | | | | | | | | | | | | Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer (GitLab)2017-10-031-10/+6
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '36670-remove-edit-form' into 'master'Sean McGivern2017-10-031-9/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Remove edit action for issuesJarka Kadlecova2017-10-031-9/+1
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-021-1/+1
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-023-0/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2813-26/+48
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-264-16/+36
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+1
| * | | | | | | | | | | | Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-024-3/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Remove lock reason and add guard clauseBrian Neel2017-09-291-1/+3
| | * | | | | | | | | | | Standardize capitalization and statusBrian Neel2017-09-272-4/+4
| | * | | | | | | | | | | # This is a combination of 1 commit.Brian Neel2017-09-274-3/+20
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'dm-json-page-title' into 'master'Jacob Schatz2017-09-293-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Encode Page-Title header as ISO-8859-1Douwe Maan2017-09-261-1/+2
View Lorry Controller Status