summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-011-3/+6
* Merge remote-tracking branch 'upstream/master' into enable-shared-runners-wit...Lin Jen-Shin2016-07-011-1/+7
|\
| * Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-1/+7
| |\
| | * Workhorse to serve email diffsZ.J. van de Weg2016-06-281-1/+7
* | | Use Ability to check pre-requisite. Change back to 403 because:Lin Jen-Shin2016-06-291-2/+1
* | | Use 409 to indicate that interface might be outdatedLin Jen-Shin2016-06-281-2/+2
|/ /
* | Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
|/
* Merge branch 'issue_19096' into 'master' Stan Hu2016-06-251-0/+7
|\
| * Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-241-0/+7
* | Add specs and improve coffescript sortable binding functionissue_15588Felipe Artur2016-06-241-1/+2
* | Fix issue being ordered twice and callback when moving between statesFelipe Artur2016-06-241-1/+1
* | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-1/+8
* | Support for rendering/redacting multiple documentsYorick Peterse2016-06-243-3/+39
* | Merge branch 'zj-pipeline-can-be-nil'Douwe Maan2016-06-231-2/+7
|\ \ | |/ |/|
| * Check if pipeline is nil before mergingzj-pipeline-can-be-nilZ.J. van de Weg2016-06-231-2/+7
* | Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-231-2/+2
|/
* Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-221-7/+1
|\
| * Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-181-6/+0
| * Use the new Members::DestroyService in group/project member controllersRémy Coutable2016-06-181-1/+1
* | Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-211-1/+1
* | 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
| |\ \ \
View Lorry Controller Status