summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-212-5/+6
|\
| * Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-203-30/+16
| |\
| * | Rename according to:Lin Jen-Shin2016-06-201-3/+3
| * | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-179-36/+123
| |\ \
| * | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-151-1/+1
| * | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+2
| * | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-147-18/+8
| |\ \ \
| * | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+1
| * | | | Rename specific_for to available_for:Lin Jen-Shin2016-06-141-1/+1
| * | | | Introduced Ci::Runner.specific_for for getting specific runners:Lin Jen-Shin2016-06-091-2/+1
* | | | | Unify check branch name existPaco Guzman2016-06-201-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-16/+0
|\ \ \ \
| * \ \ \ Merge master into issue_12758issue_12758Felipe Artur2016-06-171-4/+13
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-21/+0
| |\ \ \ \
| | * | | | Re-use notifications dropdown on user profileFelipe Artur2016-06-161-21/+0
| | * | | | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-14/+5
| | * | | | Remove schema from branch historyFelipe Artur2016-06-131-3/+17
| | | |_|/ | | |/| |
| * | | | Implement custom notification level optionsFelipe Artur2016-06-151-4/+9
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-11/+11
|\ \ \ \ \
| * | | | | Removed todo from JSON responsePhil Hughes2016-06-171-1/+0
| * | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-1/+1
| * | | | | Improved manual todosPhil Hughes2016-06-171-12/+13
| | |_|/ / | |/| | |
* | | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-2/+2
* | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-2/+4
|/ / / /
* | | | 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
|\ \ \ \ | |/ / /
View Lorry Controller Status