summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
* Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-0689-1435/+1293
|\
| * Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-061-0/+5
| |\
| | * If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-021-0/+5
| * | Merge branch 'jprovazn-label-links-update' into 'master'Sean McGivern2018-07-061-0/+138
| |\ \
| | * | Fixed pluck and renamed methodsJan Provaznik2018-07-051-7/+8
| | * | Restrict group scopeJan Provaznik2018-07-051-1/+1
| | * | Added tests for MRsJan Provaznik2018-07-051-1/+1
| | * | Fixed sql string splitsJan Provaznik2018-07-041-7/+6
| | * | Migration which fixes cross-project label referencesJan Provaznik2018-07-031-0/+138
| * | | Merge branch 'remove-trace-efficiently' into 'master'Kamil Trzciński2018-07-061-8/+11
| |\ \ \
| | * | | Revice the changelogShinya Maeda2018-07-061-1/+0
| | * | | Merge branch 'master' into remove-trace-efficientlyShinya Maeda2018-07-0628-134/+210
| | |\ \ \
| | * | | | Invalidate memoization after its erasedShinya Maeda2018-07-041-0/+2
| | * | | | Simplify the commentsShinya Maeda2018-07-041-5/+2
| | * | | | Remove traces efficientlyShinya Maeda2018-07-041-8/+13
| * | | | | Use AlreadyArchivedError if it's the caseShinya Maeda2018-07-061-3/+3
| * | | | | Merge branch 'master' into fix-trace-archive-cron-worker-race-conditionShinya Maeda2018-07-0616-61/+157
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'revert-8678cf9b' into 'master'Grzegorz Bizon2018-07-053-8/+94
| | |\ \ \ \
| | | * | | | Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-053-8/+94
| | * | | | | Updated Gitaly timeout valuesAndrew Newdigate2018-07-059-49/+50
| | * | | | | Web Terminal Ci BuildFrancisco Javier López2018-07-052-3/+11
| | |/ / / /
| | * | | | Merge branch 'issue_48474' into 'master'Sean McGivern2018-07-051-0/+1
| | |\ \ \ \
| | | * | | | Render LegacyDiffNote when diff_file blob is nilFelipe Artur2018-07-041-0/+1
| | * | | | | Merge branch 'remove-unnecessary-ignore-for-gitaly-n-plus-one' into 'master'Douwe Maan2018-07-051-1/+1
| | |\ \ \ \ \
| | | * | | | | Clean up Gitaly N+1 stack tracesSean McGivern2018-07-041-1/+1
| * | | | | | | Prevent WRITE opetaions if it's already archivedShinya Maeda2018-07-051-1/+4
| * | | | | | | Fix specShinya Maeda2018-07-051-1/+1
| * | | | | | | Check if trace exists before process `archive!` methodShinya Maeda2018-07-051-1/+1
| |/ / / / / /
| * | | | | | Merge branch '4266-board-with-config-api-ce' into 'master'Douwe Maan2018-07-041-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Backport from EE !5954Mark Chao2018-07-041-0/+1
| * | | | | | Merge branch 'ee-5481-epic-todos' into 'master'Sean McGivern2018-07-041-4/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [backend] Addressed review commentsJan Provaznik2018-07-031-3/+7
| | * | | | | Support todos for epics backportJarka Kadlecová2018-07-031-3/+4
| * | | | | | Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master'Sean McGivern2018-07-044-43/+10
| |\ \ \ \ \ \
| | * | | | | | Remove more feature flagsJacob Vosmaer2018-07-034-43/+10
| * | | | | | | Merge branch 'remove-is-shared-from-ci-runners' into 'master'Grzegorz Bizon2018-07-044-8/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Make deprecated scopes of Runner explicitKamil Trzciński2018-07-041-0/+5
| | * | | | | | | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runnersKamil Trzciński2018-06-264-8/+8
| * | | | | | | | Merge branch 'jprovazn-fix-mr-caching' into 'master'Sean McGivern2018-07-042-6/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use serialize_keys as part of highlight diff cacheJan Provaznik2018-07-042-6/+4
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'jprovazn-direct-upload' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-7/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updated multipart to support workhorse direct uploadsJan Provaznik2018-06-271-7/+9
| * | | | | | | | | Merge branch 'bvl-graphql-pipeline-lists' into 'master'Douwe Maan2018-07-045-1/+96
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add pipeline lists to GraphQLBob Van Landuyt2018-07-045-1/+96
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master'Douwe Maan2018-07-041-12/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use strong_memoize to customize the SanitizationFilter whitelistRobert Speicher2018-07-031-12/+5
| | * | | | | | | | | dup whitelist before modificationPirate Praveen2018-06-301-1/+1
| * | | | | | | | | | Make more Gitaly features mandatoryJacob Vosmaer (GitLab)2018-07-043-94/+8
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | add support for file copy on object storageMicaël Bergeron2018-07-031-19/+3