summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-pathsAhmad Sherif2017-11-143-11/+51
* Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-143-2/+24
|\
| * Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-143-2/+24
* | Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-143-1/+13
|\ \
| * | Prevents position update for image diff notesissue_40058Felipe Artur2017-11-133-1/+13
* | | Merge branch 'fix-filter-by-my-reaction' into 'master'Sean McGivern2017-11-143-1/+60
|\ \ \
| * | | Fix filter by my reaction is not workingHiroyuki Sato2017-11-133-1/+60
* | | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-1414-7/+172
|\ \ \ \
| * | | | Reduce changesfix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-072-30/+25
| * | | | Improve specShinya Maeda2017-11-073-29/+71
| * | | | Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-07389-4435/+11572
| |\ \ \ \
| * | | | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-0711-22/+71
| * | | | | Add change logShinya Maeda2017-11-061-0/+5
| * | | | | Fix spec. Revert update check.Shinya Maeda2017-11-064-6/+24
| * | | | | Do not allow jobs to be erasedShinya Maeda2017-11-068-4/+60
* | | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into '...Kamil Trzciński2017-11-143-2/+32
|\ \ \ \ \ \
| * | | | | | Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-actionLin Jen-Shin2017-11-093-2/+32
* | | | | | | Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-144-2/+65
|\ \ \ \ \ \ \
| * | | | | | | Formats bytes to human reabale number in registry table40092-fix-cluster-sizeFilipa Lacerda2017-11-134-2/+65
* | | | | | | | Merge branch 'slack_landing_page-ce-backport' into 'master'Jacob Schatz2017-11-145-0/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | backport popup varsslack_landing_page-ce-backportLuke "Jared" Bennett2017-11-131-0/+7
| * | | | | | | | url_utility and style backportLuke "Jared" Bennett2017-11-134-0/+48
* | | | | | | | | Merge branch '40127-spinach-deprecation' into 'master'Sean McGivern2017-11-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use #query_scope instead of #parent in a Spinach featureRémy Coutable2017-11-141-1/+1
* | | | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-147-56/+116
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-096-19/+57
| * | | | | | | | | | Moved LfsIntegrity specs to own fileJames Edwards-Jones2017-11-082-37/+59
* | | | | | | | | | | Merge branch 'limit_ee_conflicts-gitlab-svgs' into 'master'Sean McGivern2017-11-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update limit_ee_conflicts.md with assets/gitlab-svgs conflict resolution.limit_ee_conflicts-gitlab-svgsLuke "Jared" Bennett2017-11-131-0/+6
* | | | | | | | | | | | Merge branch '38869-project' into 'master'Phil Hughes2017-11-145-164/+142
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Export project, projectAvatar and projectImport as ES6 modules38869-projectFilipa Lacerda2017-11-135-164/+142
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'gitaly-wiki-get-all-pages' into 'master'Rémy Coutable2017-11-147-23/+155
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-137-23/+111
| * | | | | | | | | | | Add spec examples for Gitlab::Gitaly::WikiServiceAlejandro Rodríguez2017-11-131-0/+44
* | | | | | | | | | | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'Tim Zallmann2017-11-135-14/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't perform a JS request when deleting a membership.bvl-refresh-member-listing-on-removalBob Van Landuyt2017-11-135-14/+26
* | | | | | | | | | | | | Merge branch '3615-improve-welcome-screen' into 'master'Tim Zallmann2017-11-137-102/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use flexbox instead of bootstrap columns3615-improve-welcome-screenAnnabel Dunstone Gray2017-11-084-86/+97
| * | | | | | | | | | | | Add new icon; update contentAnnabel Dunstone Gray2017-11-083-3/+4
| * | | | | | | | | | | | Add four blocks to each welcome pageAnnabel Dunstone Gray2017-11-082-10/+28
| * | | | | | | | | | | | Update new project iconAnnabel Dunstone Gray2017-11-081-1/+1
| * | | | | | | | | | | | Add mobile stylesAnnabel Dunstone Gray2017-11-081-4/+15
| * | | | | | | | | | | | Reorganize landing page for new usersAnnabel Dunstone Gray2017-11-085-94/+120
* | | | | | | | | | | | | Merge branch '37174-wrong-case-for-roles-header-in-allowed-to-create-project-...Annabel Dunstone Gray2017-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add missing CSS class to capitalize the protectec tag header dropdown37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdownJose Ivan Vargas2017-11-101-1/+1
* | | | | | | | | | | | | Merge branch '40068-runner-sorting-regression' into 'master'Annabel Dunstone Gray2017-11-132-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Revert a regression on runners sorting (!15134)Takuya Noguchi2017-11-122-1/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '39436-pages-api-administrative' into 'master'Rémy Coutable2017-11-1311-23/+172
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add administrative endpoint to list all pages domainsTravis Miller2017-11-1311-23/+172
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '38605-move-ee_compat_check-to-an-earlier-build-stage' into 'mas...Sean McGivern2017-11-131-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \