summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Extract EE-specific lines from NotificationServiceSean McGivern2018-07-061-0/+6
* Merge branch 'gitaly-conflicts-find-commit' into 'master'Douwe Maan2018-07-064-106/+6
|\
| * Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-064-106/+6
* | Merge branch 'ce-5605-epic-autocomplete' into 'master'Sean McGivern2018-07-063-16/+74
|\ \
| * | Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...Mark Chao2018-07-063-16/+74
* | | Merge branch 'ide-merge-request-info' into 'master'Sean McGivern2018-07-0618-68/+294
|\ \ \
| * | | fixed misaligned iconPhil Hughes2018-07-061-1/+1
| * | | updated iconPhil Hughes2018-07-053-5/+5
| * | | fixed where the scrollbar is shown in the merge request panelPhil Hughes2018-07-052-4/+7
| * | | component specPhil Hughes2018-07-053-0/+125
| * | | added API docsPhil Hughes2018-07-054-2/+8
| * | | fixed tests :face_palm:Phil Hughes2018-07-051-2/+2
| * | | tidy up componentPhil Hughes2018-07-053-34/+17
| * | | karma & rubocop fixesPhil Hughes2018-07-052-3/+5
| * | | only include _html fields when asked forPhil Hughes2018-07-055-12/+13
| * | | added html to responsePhil Hughes2018-07-052-2/+8
| * | | update designPhil Hughes2018-07-051-33/+12
| * | | :sparkles: use pre-existing components for title and descriptionPhil Hughes2018-07-052-70/+70
| * | | Added merge request info to Web IDE sidebarPhil Hughes2018-07-053-1/+122
* | | | Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-064-2/+12
|\ \ \ \
| * | | | Add changelog entryLin Jen-Shin2018-07-021-0/+5
| * | | | If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-023-2/+7
* | | | | Merge branch 'bvl-wrap-cross-project-group-permissions' into 'master'Douwe Maan2018-07-064-5/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Create cross project group featuresBob Van Landuyt2018-07-064-5/+28
| | |_|/ | |/| |
* | | | Merge branch 'jprovazn-label-links-update' into 'master'Sean McGivern2018-07-065-1/+283
|\ \ \ \
| * | | | Fixed pluck and renamed methodsJan Provaznik2018-07-051-7/+8
| * | | | Restrict group scopeJan Provaznik2018-07-051-1/+1
| * | | | Added tests for MRsJan Provaznik2018-07-052-40/+67
| * | | | Fixed sql string splitsJan Provaznik2018-07-041-7/+6
| * | | | Migration which fixes cross-project label referencesJan Provaznik2018-07-035-1/+256
* | | | | Merge branch 'remove-trace-efficiently' into 'master'Kamil Trzciński2018-07-065-14/+140
|\ \ \ \ \
| * | | | | Fix static analysysShinya Maeda2018-07-061-8/+8
| * | | | | Add specShinya Maeda2018-07-062-6/+118
| * | | | | Revice the changelogShinya Maeda2018-07-062-2/+1
| * | | | | Remove raising error at erase_old_trace!Shinya Maeda2018-07-061-1/+1
| * | | | | Merge branch 'master' into remove-trace-efficientlyShinya Maeda2018-07-06541-22742/+41360
| |\ \ \ \ \
| * | | | | | Invalidate memoization after its erasedShinya Maeda2018-07-041-0/+2
| * | | | | | Simplify the commentsShinya Maeda2018-07-041-5/+2
| * | | | | | Add changelogShinya Maeda2018-07-041-0/+5
| * | | | | | Remove traces efficientlyShinya Maeda2018-07-042-8/+19
* | | | | | | Merge branch 'fix-trace-archive-cron-worker-race-condition' into 'master'Kamil Trzciński2018-07-067-11/+55
|\ \ \ \ \ \ \
| * | | | | | | Use AlreadyArchivedError if it's the caseShinya Maeda2018-07-064-8/+8
| * | | | | | | Merge branch 'master' into fix-trace-archive-cron-worker-race-conditionShinya Maeda2018-07-06355-1250/+2197
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Prevent WRITE opetaions if it's already archivedShinya Maeda2018-07-053-2/+27
| * | | | | | | Fix specShinya Maeda2018-07-054-9/+23
| * | | | | | | Rename build to job in ArchiveTraceWorkerShinya Maeda2018-07-051-1/+1
| * | | | | | | Add changelogShinya Maeda2018-07-051-0/+5
| * | | | | | | Check if trace exists before process `archive!` methodShinya Maeda2018-07-053-6/+4
| * | | | | | | Catch ArchiveError and ignore errors if it's already archivedShinya Maeda2018-07-051-1/+3
* | | | | | | | Merge branch 'move-contributing-link-to-partial-for-ee-exclusion' into 'master'Phil Hughes2018-07-062-5/+6
|\ \ \ \ \ \ \ \
View Lorry Controller Status