summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Memoize MR merged/closed events retrievalmemoize_merge_request_eventsPaco Guzman2016-07-081-2/+2
* Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-084-1/+10
|\
| * Added setting to set new users by default as externalDravere2016-07-074-1/+10
* | 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-0717-289/+388
* | | Merge branch 'prefer-scope' into 'master' Douwe Maan2016-07-071-4/+1
|\ \ \
| * | | Use scope rather than class methodprefer-scopeLin Jen-Shin2016-07-071-4/+1
* | | | Merge branch 'prefer-ref' into 'master' Douwe Maan2016-07-072-4/+4
|\ \ \ \
| * | | | Also use ref in Repository#commitprefer-refLin Jen-Shin2016-07-071-2/+2
| * | | | Prefer ref rather than id because id is shadowing database idLin Jen-Shin2016-07-071-2/+2
| |/ / /
* | | | Merge remote-tracking branch 'origin/master'Robert Speicher2016-07-0712-58/+212
|\ \ \ \
| * \ \ \ Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-0712-58/+212
| |\ \ \ \
| | * | | | Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protectionTimothy Andrew2016-07-072-2/+6
| | * | | | Use the `GLDropdown` component to select protected branches.Timothy Andrew2016-07-075-10/+62
| | * | | | 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-058-37/+107
| | * | | | Support wildcard matches for protected branches at the model level.Timothy Andrew2016-07-052-13/+40
* | | | | | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-0717-388/+289
|/ / / / /
* | | | | Merge branch '18181-pipeline-duration' into 'master' Robert Speicher2016-07-072-1/+8
|\ \ \ \ \
| * | | | | Change 3600 to 1.hourAnnabel Dunstone2016-07-071-1/+1
| * | | | | Update time format of duration18181-pipeline-durationAnnabel Dunstone2016-07-062-1/+8
* | | | | | Merge branch 'issues-blank-state' into 'master' Jacob Schatz2016-07-075-32/+60
|\ \ \ \ \ \
| * | | | | | Fixed spellingissues-blank-statePhil Hughes2016-07-062-11/+8
| * | | | | | Uses any method instead of nil to check for issuesPhil Hughes2016-07-051-1/+1
| * | | | | | Added blank state to issuesPhil Hughes2016-07-055-31/+62
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0749-393/+754
|\ \ \ \ \ \
| * | | | | | Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
| * | | | | | Make `DiffNote#update_position` privateDouwe Maan2016-07-071-19/+14
| * | | | | | We can't call private methods with `self.`Douwe Maan2016-07-071-5/+5
| * | | | | | Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-064-9/+5
| * | | | | | Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
| * | | | | | Add some more code comments.Douwe Maan2016-07-062-2/+4
| * | | | | | Use stored start and head for MR diff without whitespaceDouwe Maan2016-07-061-2/+2
| * | | | | | On MRs being imported, commits aren't available yetDouwe Maan2016-07-061-1/+1
| * | | | | | Keep around DiffNote position commitsDouwe Maan2016-07-061-0/+13
| * | | | | | Add send_git_patch helperDouwe Maan2016-07-062-7/+17
| * | | | | | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-0610-63/+99
| * | | | | | Allow reply-by-email with diff notesDouwe Maan2016-07-061-1/+28
| * | | | | | Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-065-9/+94
| * | | | | | Support new diff notes on MRs with diff_refsDouwe Maan2016-07-064-1/+12
| * | | | | | Add DiffNote modelDouwe Maan2016-07-062-2/+105
| * | | | | | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-068-76/+82
| * | | | | | Style diff and blob file headers the same wayDouwe Maan2016-07-067-44/+72
| * | | | | | Remove unneeded divDouwe Maan2016-07-063-8/+4
| * | | | | | Add DiffFile#blob and #old_blobDouwe Maan2016-07-065-20/+10
| * | | | | | Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-061-6/+1
View Lorry Controller Status