summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'fix/import-export-log' into 'master' Rémy Coutable2016-07-072-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix log statements in import/exportJames Lopez2016-07-072-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'member_timeago' into 'master' Dmitriy Zaporozhets2016-07-074-42/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets2016-07-072-2/+3
| * | | | | | | | | | | | | | | | | Improve UI for member row on project/group members pagesDmitriy Zaporozhets2016-07-072-45/+53
| * | | | | | | | | | | | | | | | | Add data when member joined a teamValery Sizov2016-07-072-0/+5
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets2016-07-0718-43/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-0618-43/+37
* | | | | | | | | | | | | | | | | | Merge branch 'show_push_widget_in_upstream' into 'master' Rémy Coutable2016-07-073-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Show last push widget in upstream after push to forkDrew Blessing2016-07-063-2/+9
* | | | | | | | | | | | | | | | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-07-072-14/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Allow everyone to sort tags, not only those who has accessSerg2016-07-062-14/+15
* | | | | | | | | | | | | | | | | | | Merge branch 'build-auto-refresh' into 'master' Jacob Schatz2016-07-062-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fixed issue with build auto-refresh not workingbuild-auto-refreshPhil Hughes2016-07-062-5/+5
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-063-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove plural from pipelines_spec18283-pluralize-stage-headingsAnnabel Dunstone2016-07-061-1/+1
View Lorry Controller Status