summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Apply diff view cookie on comparecompare-code-viewPhil Hughes2016-07-151-0/+1
* Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-132-9/+2
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-1/+1
* Merge branch 'lock_for_issuable' into 'master' Douwe Maan2016-07-122-2/+9
|\
| * Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-122-2/+9
* | Cache todos pending/done dashboard query countsPaco Guzman2016-07-121-1/+1
|/
* Be explicit on merge request discussion variablesPaco Guzman2016-07-121-10/+15
* Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-113-60/+111
|\
| * Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-28/+32
| |\
| * | DRY up diff_for_path actionsSean McGivern2016-07-083-77/+58
| * | Remove unused argument to CompareService#executeSean McGivern2016-07-081-4/+10
| * | Collapse large diffs by defaultSean McGivern2016-07-083-25/+89
* | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-111-3/+2
|\ \ \ | |_|/ |/| |
| * | Just give regular 404, feedback:Lin Jen-Shin2016-07-111-1/+1
| * | Use Gitlab-Workhorse-Send-Data to send entry:Lin Jen-Shin2016-07-051-2/+1
* | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-6/+0
|\ \ \
| * | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-6/+0
* | | | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-081-22/+32
| |_|/ |/| |
* | | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-11/+15
|\ \ \
| * | | Use the `GLDropdown` component to select protected branches.Timothy Andrew2016-07-071-1/+1
| * | | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-051-11/+15
| | |/ | |/|
* | | 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
View Lorry Controller Status