summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Rename ci_commit to pipeline18131-pressing-merge-when-build-succeeds-at-the-same-exact-time-that-a-build-is-failing-will-merge-the-failed-buildZ.J. van de Weg2016-06-151-5/+5
* Fix race condition on auto mergeZeger-Jan van de Weg2016-06-151-3/+12
* Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-154-3/+52
|\
| * Improve forms and specsKamil Trzcinski2016-06-151-2/+2
| * Improve design after reviewKamil Trzcinski2016-06-141-8/+9
| * Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-6/+11
| |\
| * | Authorize environments controller actionsKamil Trzcinski2016-06-141-0/+2
| * | Make retry action on pipeline to save a userKamil Trzcinski2016-06-141-1/+1
| * | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-1/+1
| |\ \
| * | | Add deployment viewsKamil Trzcinski2016-06-111-1/+28
| * | | Added initial version of deploymentsKamil Trzcinski2016-06-103-8/+10
| * | | commit statusKamil Trzcinski2016-06-101-0/+17
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-152-23/+44
|\ \ \ \
| * \ \ \ Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-0/+31
| |\ \ \ \
| | * | | | Returns created todos to control rather than re-queryPhil Hughes2016-06-141-2/+2
| | * | | | Uses update URL to update the status of a todoPhil Hughes2016-06-141-9/+12
| | * | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-143-28/+28
| | * | | | Manually create todo for issuablePhil Hughes2016-06-142-0/+28
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-6/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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 '17298-wiki-xss' into 'master' Robert Speicher2016-06-141-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Forbid scripting for wiki filesSean McGivern2016-06-141-0/+3
| |/ /
* | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
|\ \ \ | |/ /
| * | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-131-1/+1
| |\ \ | | |/ | |/|
| | * Improve Gitlab::Auth method namesJacob Vosmaer2016-06-101-1/+1
* | | Test controllers if they allow to keep artifactsKamil Trzcinski2016-06-131-0/+1
* | | Remove keep_artifacts from BuildsControllerKamil Trzcinski2016-06-131-6/+0
* | | Validate existence of artifacts in ArtifactsController, render 404 if not foundKamil Trzcinski2016-06-131-6/+5
* | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-0/+5
* | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+6
|/ /
* | 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
View Lorry Controller Status