summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'Filipa Lacerda2017-11-151-2/+29
|\
| * Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojioneEric Eastwood2017-11-151-1/+6
| * Regenerate emoji digests with latest gemojioneEric Eastwood2017-11-141-1/+23
* | Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-ti...Douwe Maan2017-11-152-0/+2
|\ \
| * | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-152-0/+2
* | | Merge branch '39573-hashed-storage-backup' into 'master'Stan Hu2017-11-151-8/+16
|\ \ \
| * | | Fix dumping hashed storage based repositoryGabriel Mazetto2017-11-151-8/+16
| |/ /
* | | Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
|/ /
* | Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-152-0/+8
|\ \ | |/ |/|
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-152-0/+8
* | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-141-1/+11
|\ \
| * | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-141-1/+11
| |/
* | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-142-2/+2
|\ \
| * \ Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-0755-478/+888
| |\ \
| * | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-072-2/+0
| * | | Fix spec. Revert update check.Shinya Maeda2017-11-062-0/+2
| * | | Do not allow jobs to be erasedShinya Maeda2017-11-062-2/+2
* | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-141-1/+4
|\ \ \ \
| * | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-091-1/+4
* | | | | Merge branch 'gitaly-wiki-get-all-pages' into 'master'Rémy Coutable2017-11-143-18/+62
|\ \ \ \ \
| * | | | | Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-133-18/+62
* | | | | | Add administrative endpoint to list all pages domainsTravis Miller2017-11-133-3/+48
* | | | | | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-132-3/+36
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'zj-move-repo-exists-opt-out' into 'master'Sean McGivern2017-11-131-1/+1
|\ \ \ \ \
| * | | | | Repository Exists check is OPT_OUT for GitalyZeger-Jan van de Weg2017-11-091-1/+1
* | | | | | Prepare Repository#fetch_source_branch for migrationJacob Vosmaer (GitLab)2017-11-103-29/+97
* | | | | | Merge branch 'cleanup-issues-schema' into 'master'Sean McGivern2017-11-101-1/+0
|\ \ \ \ \ \
| * | | | | | Clean up schema of the "issues" tablecleanup-issues-schemaYorick Peterse2017-11-091-1/+0
* | | | | | | Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Icon Sprite URL is also local even if asset_host is setTim Zallmann2017-11-091-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Add /groups/:id/subgroups endpoint to APIWinnie Hellmann2017-11-091-22/+44
| |_|/ / / / |/| | | | |
* | | | | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'Rémy Coutable2017-11-091-0/+6
|\ \ \ \ \ \
| * | | | | | Fix acceptance of username for Mattermost service update via APIMark Fletcher2017-11-081-0/+6
* | | | | | | Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ...Sean McGivern2017-11-091-2/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Revert "add metrics tagging to the sidekiq middleware"39958-updatemergerequestsworker-are-failing-on-metric-taggingmicael.bergeron2017-11-081-2/+0
| |/ / / / /
* | | | | | Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-092-3/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Support importing GH projects without rate limitsgithub-rake-task-rate-limitingYorick Peterse2017-11-081-0/+6
| * | | | | Restore GH enterprise support in the Rake taskYorick Peterse2017-11-081-3/+3
| |/ / / /
* | | | | Merge branch '36099-api-responses-missing-x-content-type-options-header' into...Douwe Maan2017-11-081-1/+4
* | | | | Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-081-1/+3
|/ / / /
* | | | Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-082-6/+14
|\ \ \ \
| * | | | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-072-6/+14
| | |_|/ | |/| |
* | | | Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-082-17/+47
|\ \ \ \
| * | | | Fix the GH importer Rake taskgithub-enterprise-support-importerYorick Peterse2017-11-081-14/+18
| * | | | Restore Enterprise support in the GH importerYorick Peterse2017-11-081-3/+29
* | | | | Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-082-5/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Migrate GitLab::Git::Wiki.update_page to GitalyKim "BKC" Carlbäcker2017-11-082-5/+45
* | | | | Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-082-4/+15
* | | | | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-082-2/+2
|\ \ \ \ \
| * | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-082-2/+2
| | |/ / / | |/| | |
View Lorry Controller Status