summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into single-file-diffsSean McGivern2016-07-1118-51/+66
|\
| * Add reminder to not paste private SSH keysIngo Blechschmidt2016-07-091-1/+1
| * Use btn-danger for delete button.Connor Shea2016-07-081-1/+1
| * Update New Snippet buttons.Connor Shea2016-07-084-43/+45
| * Merge branch 'cs-cropper' into 'master' Fatih Acet2016-07-0810-0/+13
| |\
| | * Fix preferences tests.cs-cropperConnor Shea2016-06-3010-3/+12
| | * Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-291-0/+4
| * | Merge branch 'improve-project-limit-field' into 'master' Rémy Coutable2016-07-081-1/+1
| |\ \
| | * | Add min attribute to project_limit field on user's formAndrey Krivko2016-07-081-1/+1
| * | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-3/+3
| * | | Merge branch 'dont-render-discussion-notes-on-not-html-requests'Douwe Maan2016-07-081-2/+2
| |\ \ \
| | * | | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-081-2/+2
* | | | | Support renames in diff_for_path actionsSean McGivern2016-07-111-1/+1
* | | | | Make expand_all param more explicitSean McGivern2016-07-082-3/+3
* | | | | Allow expanding all diffs at onceSean McGivern2016-07-082-1/+3
* | | | | Ensure only renderable text diffs are collapsedSean McGivern2016-07-082-7/+6
* | | | | Disable overflow messagesSean McGivern2016-07-082-9/+1
* | | | | Collapse large diffs by defaultSean McGivern2016-07-082-25/+31
|/ / / /
* | | | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+7
|\ \ \ \
| * | | | Added setting to set new users by default as externalDravere2016-07-071-0/+7
| | |/ / | |/| |
* | | | Merge branch '9127-link-report-to-profile' into 'master' Robert Speicher2016-07-082-2/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed unnecessary `id` from links and corrected tests to use the proper mat...9127-link-report-to-profilePatricio Cano2016-07-072-2/+2
| * | | Added specs to check for the correct links.Patricio Cano2016-07-062-2/+2
| * | | Link to the user's profile in the abuse reports and add a link to the admin a...Patricio Cano2016-07-062-2/+7
* | | | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-077-256/+251
* | | | Merge remote-tracking branch 'origin/master'Robert Speicher2016-07-076-32/+97
|\ \ \ \
| * \ \ \ Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-076-32/+97
| |\ \ \ \
| | * | | | Use the `GLDropdown` component to select protected branches.Timothy Andrew2016-07-072-8/+18
| | * | | | Add documentation for wildcard protected branches.Timothy Andrew2016-07-051-1/+2
| | * | | | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-7/+7
| | * | | | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-055-25/+79
* | | | | | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-077-251/+256
|/ / / / /
* | | | | Merge branch '18181-pipeline-duration' into 'master' Robert Speicher2016-07-071-1/+1
|\ \ \ \ \
| * | | | | Update time format of duration18181-pipeline-durationAnnabel Dunstone2016-07-061-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'issues-blank-state' into 'master' Jacob Schatz2016-07-073-29/+36
|\ \ \ \ \
| * | | | | Fixed spellingissues-blank-statePhil Hughes2016-07-061-3/+3
| * | | | | Uses any method instead of nil to check for issuesPhil Hughes2016-07-051-1/+1
| * | | | | Added blank state to issuesPhil Hughes2016-07-053-28/+35
| | |/ / / | |/| | |
* | | | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0718-112/+100
|\ \ \ \ \
| * | | | | Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
| * | | | | Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-061-1/+1
| * | | | | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-065-36/+23
| * | | | | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-062-2/+3
| * | | | | Style diff and blob file headers the same wayDouwe Maan2016-07-064-43/+50
| * | | | | Remove unneeded divDouwe Maan2016-07-063-8/+4
| * | | | | Add DiffFile#blob and #old_blobDouwe Maan2016-07-063-8/+7
| * | | | | Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-063-9/+7
| * | | | | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-7/+7
* | | | | | Merge branch 'issue_3946' into 'master' Robert Speicher2016-07-077-256/+251
|\ \ \ \ \ \
View Lorry Controller Status