summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'download_snippets' into 'master' Sean McGivern2016-10-121-3/+11
|\
| * Added 'Download' button to snippet viewJustin DiPierro2016-10-111-3/+11
* | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-111-0/+2
|\ \
| * \ Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-1112-76/+107
| |\ \
| * | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-1/+1
| * | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-0/+2
* | | | Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-111-1/+22
|\ \ \ \
| * | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-071-0/+2
| * | | | Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-1/+20
* | | | | Merge branch 'precalculate-trending-projects' into 'master' Robert Speicher2016-10-111-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Precalculate trending projectsprecalculate-trending-projectsYorick Peterse2016-10-101-2/+1
* | | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-111-25/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove NamespacesControllerDmitriy Zaporozhets2016-10-101-25/+0
| |/ / /
* | | | Remove Ci::ApplicationControllerTakuya Noguchi2016-10-103-9/+2
|/ / /
* | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-1/+1
* | | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-061-1/+2
|\ \ \
| * | | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-051-1/+2
* | | | Improve issue load time performance by avoiding ORDER BY in find_by callsh-fix-issue-perf-order-by-issueStan Hu2016-10-061-1/+2
* | | | Merge branch 'issue-boards-new-issue' into 'master' Fatih Acet2016-10-061-6/+31
|\ \ \ \
| * | | | Add service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-061-11/+18
| * | | | Add authorization to Projects::Boards::IssuesController#create actionDouglas Barbosa Alexandre2016-10-061-0/+5
| * | | | Fixed issue with backlog list not savingPhil Hughes2016-10-061-1/+1
| * | | | Added ability to save the new issuePhil Hughes2016-10-061-0/+13
| | |/ / | |/| |
* | | | MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-23/+43
|/ / /
* | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-2/+8
|\ \ \ | |/ / |/| |
| * | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-281-2/+8
| |\ \
| | * | Convert label creation from API to controller endpointNick Thomas2016-09-231-2/+8
* | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-051-0/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283bFatih Acet2016-10-051-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-044-17/+22
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-10-043-7/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-10-0337-206/+351
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-09-0215-37/+84
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed boards filtersPhil Hughes2016-08-301-0/+2
* | | | | | | | | Merge branch 'fix_group_links_404' into 'master' Fatih Acet2016-10-051-8/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | fix group links 404barthc2016-10-051-8/+16
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Refactor TrendingProjectsFinder to support cachingYorick Peterse2016-10-051-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'restrict-failed-2fa-attempts' into 'master' Rémy Coutable2016-10-041-2/+13
|\ \ \ \ \ \ \
| * | | | | | | Restrict failed login attempts for users with 2FASean McGivern2016-10-041-2/+13
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rc-improve-members-destroy-service' into 'master' Robert Speicher2016-10-043-15/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix a few things after the initial improvment to Members::DestroyServiceRémy Coutable2016-10-033-5/+7
| * | | | | | Improve Members::DestroyServiceRémy Coutable2016-10-033-14/+6
* | | | | | | Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-031-1/+1
|/ / / / / /
* | | | | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-031-5/+0
|\ \ \ \ \ \
| * | | | | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-031-5/+0
| | |_|/ / / | |/| | | |
* | | | | | Add a /wip slash commandThomas Balthazar2016-10-031-1/+1
|/ / / / /
* | | | | Merge branch '21744-fix-missing-values-in-linter' into 'master' Rémy Coutable2016-09-301-0/+1
|\ \ \ \ \
| * | | | | Expose jobs to viewKatarzyna Kobierska2016-09-301-0/+1
* | | | | | Merge branch 'close-merge-request-if-open-without-source-project' into 'master' Rémy Coutable2016-09-301-5/+8
|\ \ \ \ \ \
| * | | | | | Change callbackKatarzyna Kobierska2016-09-301-1/+1