summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Support new diff notes on MRs with diff_refsDouwe Maan2016-07-064-1/+12
| * Add DiffNote modelDouwe Maan2016-07-068-22/+155
| * Add Gitlab::Git::PositionTracerDouwe Maan2016-07-061-0/+168
| * Add Gitlab::Diff::LineMapperDouwe Maan2016-07-062-0/+201
| * Add Gitlab::Git::PositionDouwe Maan2016-07-062-0/+182
| * Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-0613-102/+120
| * Style diff and blob file headers the same wayDouwe Maan2016-07-068-54/+77
| * Remove unneeded divDouwe Maan2016-07-063-8/+4
| * Add DiffFile#blob and #old_blobDouwe Maan2016-07-066-25/+31
| * Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-062-6/+17
| * Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-0620-57/+111
| * Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-0625-128/+162
| * Store diff head and start commit shas on MR diffsDouwe Maan2016-07-063-7/+20
* | Merge branch 'pending-delete-project-notifications' into 'master' Robert Speicher2016-07-074-1/+34
|\ \
| * | Exclude projects pending delete from notificationsSean McGivern2016-07-074-1/+34
* | | Merge branch 'issue_3946' into 'master' Robert Speicher2016-07-0721-296/+399
|\ \ \
| * | | Namespaces should filter remotelyAlfredo Sumaran2016-07-071-0/+1
| * | | Rephrase deletion alert messageAlfredo Sumaran2016-07-071-1/+1
| * | | Do not show Any Namespace option when neededAlfredo Sumaran2016-07-072-3/+5
| * | | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-0721-296/+396
* | | | Merge branch 'dz-remove-icons' into 'master' Jacob Schatz2016-07-071-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove icons from file edit tabsdz-remove-iconsDmitriy Zaporozhets2016-07-041-2/+0
* | | | Merge branch 'escape-file-extension' into 'master' Robert Speicher2016-07-072-1/+2
|\ \ \ \
| * | | | Escape file extension when parsing search results (!5141)winniehell2016-07-072-1/+2
| | |/ / | |/| |
* | | | Merge branch 'fix/import-controller-error' into 'master' Robert Speicher2016-07-073-4/+19
|\ \ \ \ | |/ / / |/| | |
| * | | added testJames Lopez2016-07-071-0/+17
| * | | added changelogfix/import-controller-errorJames Lopez2016-07-071-0/+1
| * | | fix 404 error, redirect back with flash messageJames Lopez2016-07-071-4/+1
|/ / /
View Lorry Controller Status