summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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-122-5/+10
|/
* Be explicit on merge request discussion variablesPaco Guzman2016-07-121-10/+15
* Clean path infoConnor Shea2016-07-111-1/+1
* Update the help_page_path route to accept paths directly instead of using par...Connor Shea2016-07-111-6/+4
* Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-114-60/+136
|\
| * Handle more than two paths in MergeRequest#diffsSean McGivern2016-07-111-1/+3
| * Merge branch 'master' into single-file-diffsSean McGivern2016-07-112-30/+34
| |\
| * | Make expand_all param more explicitSean McGivern2016-07-081-1/+1
| * | DRY up diff_for_path actionsSean McGivern2016-07-084-77/+81
| * | 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 'rubocop/enable-identical-conditional-branches-cop' into 'master' Robert Speicher2016-07-081-2/+2
|\ \ \
| * | | Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-081-2/+2
| | |/ | |/|
* | | 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
* | | | Merge branch 'dont-render-discussion-notes-on-not-html-requests'Douwe Maan2016-07-081-22/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Added setting to set new users by default as externalDravere2016-07-071-0/+1
* | | | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-071-2/+3
* | | | Merge remote-tracking branch 'origin/master'Robert Speicher2016-07-071-11/+15
|\ \ \ \
| * \ \ \ 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
| | | |_|/ | | |/| |
* | | | | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-071-3/+2
|/ / / /
* | | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-075-26/+50
|\ \ \ \
| * | | | 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
| | |_|/ | |/| |
* | | | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-071-2/+3
| |_|/ |/| |
* | | fix 404 error, redirect back with flash messageJames Lopez2016-07-071-4/+1
|/ /
* | Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-051-1/+1
* | 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
* | Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+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-015-8/+16
|\ \
View Lorry Controller Status