summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Add send_git_patch helperDouwe Maan2016-07-061-6/+9
* Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-2/+19
* Support new diff notes on MRs with diff_refsDouwe Maan2016-07-061-0/+1
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-063-7/+14
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-11/+7
* Correct access control flow for Git HTTP requests.Patricio Cano2016-07-051-2/+8
* Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano2016-07-051-6/+6
* Render the status message with `plain:` so that the message gets passed to th...Patricio Cano2016-07-051-1/+1
* Render :forbidden *only* if HTTP is disabled.Patricio Cano2016-07-051-1/+5
* Return :forbidden if HTTP protocol access is not allowedPatricio Cano2016-07-051-0/+6
* Simplify access checksPatricio Cano2016-07-051-1/+7
* Only allow Git Access on the allowed protocolPatricio Cano2016-07-051-1/+1
* Merge branch 'git-http-kerberos-ce' into 'master' Douwe Maan2016-07-011-4/+35
|\
| * Groundwork for Kerberos SPNEGO (EE feature)Jacob Vosmaer2016-07-011-4/+35
* | Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-011-3/+6
|\ \
| * | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-011-3/+6
* | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-013-3/+0
* | | Fix snippets comments not displayed19388-fix-snippets-notes-not-shownRémy Coutable2016-07-011-1/+1
|/ /
* | 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
| |\ \ \ \ | | | |_|/ | | |/| |