summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-082-3/+1
* Merge branch 'backport-issues-controller-changes' into 'master'Sean McGivern2017-09-082-14/+17
|\
| * Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-0711-17/+28
| |\
| * | Move issues index variable setting to a methodSean McGivern2017-09-072-14/+17
* | | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-071-12/+10
| |/ |/|
* | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-072-7/+10
|\ \
| * \ Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-0710-210/+244
| |\ \
| * \ \ Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-071-2/+1
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-0615-20/+54
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-065-24/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-045-29/+63
| |\ \ \ \ \ \
| * | | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-312-7/+10
* | | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-078-9/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-078-9/+15
* | | | | | | | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-072-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Restore some changes from !9199Rubén Dávila2017-09-062-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-078-209/+241
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Finish backports and fix specsFelipe Artur2017-09-061-1/+1
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-0613-66/+175
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Fix specs BACKPORTFelipe Artur2017-09-041-1/+1
| * | | | | | Small fixesFelipe Artur2017-08-311-1/+1
| * | | | | | Continue BE backportFelipe Artur2017-08-314-1/+45
| * | | | | | Group boards CE backportFelipe Artur2017-08-287-209/+197
* | | | | | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-061-2/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-066-3/+23
|\ \ \ \ \ \
| * | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-067-10/+23
| * | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-067-9/+16
|\ \ \ \ \ \
| * | | | | | rework the contributor badgemicael.bergeron2017-09-061-7/+4
| * | | | | | round of fixes after code reviewmicael.bergeron2017-09-061-2/+5
| * | | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-067-9/+16
| |/ / / / /
* | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-5/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-063-6/+32
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-5/+7
* | | | | | | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-1/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Profile updates from providersAlexander Keramidas2017-09-061-2/+0
| |_|_|/ / / |/| | | | |
* | | | | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-061-1/+1
* | | | | | Add functionality to collapse outdated diff comments regardless of discussion...Ashley Dumaine2017-09-061-0/+1
| |_|/ / / |/| | | |
* | | | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-053-6/+32
| |/ / / |/| | |
* | | | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-032-18/+28
| |_|/ |/| |
* | | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-21/+57
|\ \ \
| * \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-313-5/+15
| |\ \ \
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-311-1/+1
| |\ \ \ \
| * | | | | Fix specsDouwe Maan2017-08-301-1/+1
| * | | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-308-19/+45
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-233-6/+19
| |\ \ \ \ \ \
| * | | | | | | No explicit `to_a` or instance variables needed.Douwe Maan2017-08-182-9/+15
| * | | | | | | Prefer polymorphism over `is_a?`Douwe Maan2017-08-171-2/+2
| * | | | | | | Remove cross-references user cannot see from issue discussions JSONDouwe Maan2017-08-171-3/+5
View Lorry Controller Status