summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-083-24/+35
* Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-0721-296/+399
* Merge branch 'upgrade-oauth2' into 'master' Robert Speicher2016-07-072-6/+6
|\
| * Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2Connor Shea2016-07-012-6/+6
* | 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-0724-70/+585
|\ \ \
| * \ \ Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-0724-70/+585
| |\ \ \
| | * | | Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protectionTimothy Andrew2016-07-073-4/+8
| | * | | Use the `GLDropdown` component to select protected branches.Timothy Andrew2016-07-076-11/+65
| | * | | Add wildcard protected branches to the CHANGELOG.Timothy Andrew2016-07-061-0/+1
| | * | | Add documentation for wildcard protected branches.Timothy Andrew2016-07-055-3/+28
| | * | | Add a feature spec for protected branch creation.Timothy Andrew2016-07-051-0/+82
| | * | | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-054-14/+81
| | * | | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-059-38/+108
| | * | | Support wildcard matches for protected branches at the model level.Timothy Andrew2016-07-054-15/+227
* | | | | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-0721-399/+296
|/ / / /
* | | | 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-0710-40/+71
|\ \ \ \ \
| * | | | | Fixed spellingissues-blank-statePhil Hughes2016-07-062-11/+8
| * | | | | Updated testsPhil Hughes2016-07-055-8/+11
| * | | | | 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-0799-556/+4622
|\ \ \ \ \
| * | | | | Add comment with diff to DiffPositionUpdateService specnew-diff-notesDouwe Maan2016-07-071-0/+104
| * | | | | Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
| * | | | | Make `DiffNote#update_position` privateDouwe Maan2016-07-072-58/+58
| * | | | | Update test with new factory nameDouwe Maan2016-07-071-2/+2
| * | | | | 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-066-18/+14
| * | | | | Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
| * | | | | Add some more code comments.Douwe Maan2016-07-065-3/+20
| * | | | | 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-064-11/+21
| * | | | | Add tests for MergeRequest#reload_diffDouwe Maan2016-07-061-0/+40
| * | | | | Add tests for DiffNoteDouwe Maan2016-07-061-0/+186
| * | | | | Add tests for DiffPositionUpdateServiceDouwe Maan2016-07-061-0/+71
| * | | | | Add tests for PositionDouwe Maan2016-07-061-0/+341
| * | | | | Add tests for PositionTracerDouwe Maan2016-07-061-0/+1758
| * | | | | Update schemaDouwe Maan2016-07-061-1/+7
| * | | | | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-0614-78/+622
| * | | | | Allow reply-by-email with diff notesDouwe Maan2016-07-063-10/+51
| * | | | | Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-065-9/+94
View Lorry Controller Status