summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-141-37/+6
* Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-141-17/+15
* Add request access for groupsRémy Coutable2016-06-141-24/+20
* Initial implementation of user access request to projectsDavid Alexander2016-06-141-2/+29
* Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-131-1/+1
|\
| * Improve Gitlab::Auth method namesJacob Vosmaer2016-06-101-1/+1
* | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-104-15/+5
|\ \
| * \ Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-102-1/+148
| |\ \ | | |/
| * | Add send_git_diff helperDouwe Maan2016-06-087-28/+60
| |\ \
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-063-10/+3
* | | | CI build page UI updatePhil Hughes2016-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
* | | | Skip authenticity token checks for Git HTTPJacob Vosmaer2016-06-081-0/+2
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-089-62/+97
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-061-0/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-0/+3
| | | |\ \ \ \
| | | | * | | | Backend awardables on commentsZJ van de Weg2016-06-061-0/+3
| | | | | |_|/ | | | | |/| |
| * | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-063-6/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Use `@ci_commit` in merge_request_controllerKamil Trzcinski2016-06-061-4/+4
| | * | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-062-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' Douwe Maan2016-06-062-2/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Remove 'unscoped' from project builds selectionTomasz Maczukin2016-06-042-2/+2
| * | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-063-33/+28
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-063-33/+28
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Respond to .json onlyAlfredo Sumaran2016-06-031-1/+6
| | | * | | | WIP: allow adding and removing labels in bulkSean McGivern2016-06-031-1/+3
| | | * | | | Add label_ids to bulk_update_paramsAlfredo Sumaran2016-06-031-1/+1
| | | * | | | Ability to assign a label to multiple issuesAlfredo Sumaran2016-06-031-1/+2
| | | |/ / /
| | | * | | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-035-31/+37
| | | |\ \ \ | | | | |/ /
| | | * | | Merge branch 'master' into awardablesZJ van de Weg2016-05-302-3/+3
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-254-5/+89
| | | |\ \ \ \
| | | * | | | | Fix backend merge mistakesZJ van de Weg2016-05-191-1/+1
| | | * | | | | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-4/+9
| | | |\ \ \ \ \
| | | | * | | | | Fix latests concernsZJ van de Weg2016-05-181-4/+9
| | | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-0/+34
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1810-19/+30
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-2/+4
| | | |\ \ \ \ \ \ \