summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-105-15/+6
|\
| * Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-106-42/+153
| |\
| * \ Add send_git_diff helperDouwe Maan2016-06-088-29/+70
| |\ \
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-064-10/+4
* | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-101-1/+1
|\ \ \ \
| * | | | CI build page UI updatePhil Hughes2016-06-101-1/+1
| | |_|/ | |/| |
* | | | Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+1
|/ / /
* | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+1
|\ \ \
| * | | Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-1/+1
* | | | Merge branch 'git-http-no-authenticity-token' into 'master' Robert Speicher2016-06-081-0/+2
|\ \ \ \
| * | | | Skip authenticity token checks for Git HTTPJacob Vosmaer2016-06-081-0/+2
* | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher2016-06-081-0/+1
|\ \ \ \ \
| * | | | | Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+1
| |/ / / /
* | | | | Merge branch 'password-min-length-placeholder' into 'master' Robert Speicher2016-06-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added minimum password length to password fieldpassword-min-length-placeholderPhil Hughes2016-06-031-0/+1
* | | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-082-40/+147
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-0815-96/+251
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Remove code duplication in JwtControllerJacob Vosmaer2016-06-061-39/+1
| * | | | | Remove instances of Auth.newJacob Vosmaer2016-06-031-1/+1
| * | | | | Fewer silly instance variablesJacob Vosmaer2016-06-031-11/+9
| * | | | | Use #present?Jacob Vosmaer2016-06-031-1/+1
| * | | | | Refactor _allowed? methods as Rémy askedJacob Vosmaer2016-06-031-15/+9
| * | | | | Changes after more review from RémyJacob Vosmaer2016-06-031-7/+9
| * | | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-0258-246/+622
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Make CI/Oauth/rate limiting reusableJacob Vosmaer2016-04-291-70/+8
| * | | | | More changes suggested by RémyJacob Vosmaer2016-04-251-19/+17
| * | | | | Don't mess up our parent controllerJacob Vosmaer2016-04-222-30/+28
| * | | | | Some changes after review from Rémy and ValeryJacob Vosmaer2016-04-221-28/+33
| * | | | | Comment and whitespaceJacob Vosmaer2016-04-151-9/+20
| * | | | | Avoid path helper name clashJacob Vosmaer2016-04-151-4/+4
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-1512-67/+118
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-1221-77/+164
| |\ \ \ \ \ \
| * | | | | | | Clarify intentionsJacob Vosmaer2016-04-061-4/+7
| * | | | | | | Move workhorse protocol code into libJacob Vosmaer2016-04-061-8/+5
| * | | | | | | Add some upload specsJacob Vosmaer2016-03-241-7/+29
| * | | | | | | Get Grack::Auth tests to passJacob Vosmaer2016-03-232-5/+184
* | | | | | | | Fix endless redirections when accessing user OAuth applications when they are...Stan Hu2016-06-081-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-2/+27
|\ \ \ \ \ \ \
| * | | | | | | add :set_priorities to :authorize_admin_labels!Alfredo Sumaran2016-06-061-1/+1
| * | | | | | | Remove unnecesary paramAlfredo Sumaran2016-06-061-1/+1
| * | | | | | | Update method and routeAlfredo Sumaran2016-06-061-2/+2
| * | | | | | | Add unprioritized scopeAlfredo Sumaran2016-06-061-2/+2
| * | | | | | | Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-5/+10
| * | | | | | | Sort by label priorityThijs Wouters2016-06-061-1/+1
| * | | | | | | Prioritize labels functionalityAlfredo Sumaran2016-06-061-1/+21
* | | | | | | | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-3/+10
* | | | | | | | | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
* | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-062-1/+13
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-1/+13
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |