summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Add Page-Title header to tree and blob JSON endpointsDouwe Maan2017-09-263-0/+10
* | refactor emails servicerefactor-servicesJames Lopez2017-09-282-3/+3
* | refactor users update serviceJames Lopez2017-09-288-17/+17
* | refactor keys controllerJames Lopez2017-09-281-1/+7
* | refactor some controllers to make them EE friendlyJames Lopez2017-09-283-5/+21
* | refactor services to match EE signatureJames Lopez2017-09-289-20/+20
* | Backport part of c777bb91fd7 and 4074cb3b7c16 from EERémy Coutable2017-09-261-1/+1
|/
* Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-231-7/+20
* Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
* Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\
| * Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
* | Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-201-5/+3
|\ \
| * | Employ ForkProjectsFinder in ForksControllerMark Fletcher2017-09-201-5/+3
| |/
* | Do not perform hard check (presence of file on storage)Kamil Trzcinski2017-09-191-1/+1
* | Merge branch 'sh-stop-loading-issue-discussions' into 'master'Douwe Maan2017-09-191-3/+0
|\ \
| * | Remove unnecessary loading of discussions in `IssuesController#show`sh-stop-loading-issue-discussionsStan Hu2017-09-191-3/+0
| |/
* | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-198-22/+57
|/
* Merge branch 'sh-optimize-discussion-json' into 'master'Yorick Peterse2017-09-181-2/+2
|\
| * Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-181-2/+2
* | Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-181-1/+1
|\ \
| * | Clean up read_registry scope changesRobin Bobbitt2017-09-181-1/+1
* | | Merge branch 'fix-label-message' into 'master'Rémy Coutable2017-09-181-1/+1
|\ \ \
| * | | Fix notification message when admin label was modifiedfix-label-messageRobert Schilling2017-09-181-1/+1
| | |/ | |/|
* | | Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-181-40/+7
|\ \ \ | |/ / |/| |
| * | move `find_users` method into finder and add `load_group` methodMaxim Rydkin2017-09-101-19/+7
| * | rename yet_another_users_finder into autocomplete_users_finderMaxim Rydkin2017-09-101-1/+1
| * | extract finder and add first testMaxim Rydkin2017-09-101-22/+1
* | | created services for keyshaseeb2017-09-154-8/+7
* | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-151-1/+1
| |/ |/|
* | Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-141-4/+9
|\ \
| * | fix another N+1 query for label priorities34510-board-issues-sql-speedupmicael.bergeron2017-09-121-2/+2
| * | add association preloading for issue boardsmicael.bergeron2017-09-121-4/+9
* | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-132-6/+6
|\ \ \
| * | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-2/+2
| * | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-121-4/+4
| |/ /
* | | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-122-1/+3
|\ \ \ | |/ / |/| |
| * | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-1/+3
| |/
* | Eager load namespace owners for project dashboardsdashboards-projects-controllerYorick Peterse2017-09-111-1/+1
|/
* 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
| |\ \ \ \ \
View Lorry Controller Status