summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-313-3/+9
* Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-0/+2
|\
| * Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-0/+2
* | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-261-1/+1
* | Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-263-5/+1
|\ \
| * | Consistently display last push event widgetDouwe Maan2017-05-253-5/+1
* | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-253-26/+2
|\ \ \ | |/ / |/| |
| * | Remove @commit in compare and MR controllersDouwe Maan2017-05-232-11/+1
| * | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-232-3/+0
| * | Clean up diff renderingDouwe Maan2017-05-231-12/+1
* | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-251-6/+2
|\ \ \
| * | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-251-6/+2
| |/ /
* | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-251-1/+1
|\ \ \
| * | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-241-1/+1
| |/ /
* | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-255-18/+108
|\ \ \
| * | | Implement web hooks loggingAlexander Randa2017-05-255-18/+108
* | | | user can reset his rss token on the account pageAlexis Reigel2017-05-241-0/+8
* | | | atom links with rss token instead of private tokenAlexis Reigel2017-05-241-7/+25
| |/ / |/| |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 17489-hide-code...Valery Sizov2017-05-2336-203/+320
|\ \ \
| * \ \ Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-231-0/+1
| |\ \ \
| | * | | Sort environments folders when opening themZ.J. van de Weg2017-05-171-0/+1
| | |/ /
| * | | Merge branch 'dz-rename-pipelines-settings-tab' into 'master'Dmitriy Zaporozhets2017-05-221-1/+1
| |\ \ \
| | * | | Rename CI/CD Pipelines to Pipelines in the project settingsDmitriy Zaporozhets2017-05-111-1/+1
| * | | | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-191-1/+4
| |\ \ \ \
| | * | | | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-191-1/+4
| * | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-191-8/+10
| |\ \ \ \ \
| | * | | | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-8/+10
| * | | | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-196-5/+37
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-196-13/+33
| | * | | | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-181-5/+17
| | * | | | | Fix #32506Michael Kozono2017-05-181-1/+1
| | |/ / / /
| * | | | | Fixes the 500 for custom apearance header logo and logoAlexis Reigel2017-05-191-0/+2
| |/ / / /
| * | | | Show last commit for current tree on tree pageDouwe Maan2017-05-172-0/+4
| | |/ / | |/| |
| * | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-161-1/+1
| |\ \ \
| | * | | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-131-1/+1
| | | |/ | | |/|
| * | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-151-3/+3
| |\ \ \
| | * | | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-131-3/+3
| | |/ /
| * | | Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
| |/ /
| * | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+1
| * | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-7/+11
| |\ \
| | * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-7/+11
| * | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-121-2/+4
| |\ \ \
| | * | | Respond with 404 when metrics are not enabled or deployment_metrics is not im...Pawel Chojnacki2017-05-121-1/+3
| | * | | Custom queries for prometheusPawel Chojnacki2017-05-111-1/+1
| | |/ /
| * | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-121-3/+10
| |\ \ \
| | * | | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assigneesValery Sizov2017-05-111-3/+10
| | |/ /
| * | | Merge branch 'refactor-realtime-issue' into 'master' Filipa Lacerda2017-05-121-1/+0
| |\ \ \
| | * \ \ Merge branch 'master' into refactor-realtime-issuePhil Hughes2017-05-1119-44/+39
| | |\ \ \
| | * | | | Fixed tests on textarea looking for innerText instead of valuePhil Hughes2017-05-101-1/+0
| * | | | | Fix redirect message for groups and usersMichael Kozono2017-05-111-4/+4
| | |_|/ / | |/| | |