summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Raise the QA Capybara's default wait time from 4 to 10rs-qa-default-timeoutRobert Speicher2017-11-141-1/+1
| | | | | We were seeing intermittent failures on CI due to slow responses from certain endpoints.
* Merge branch '32098-pipelines-navigation' into 'master'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settingsPhil Hughes2017-11-1412-252/+385
|\ | | | | | | | | Stops page reload when changing tabs or pages - uses API requests instead See merge request gitlab-org/gitlab-ce!15280
| * Stops page reload when changing tabs or pages - uses API requests insteadFilipa Lacerda2017-11-1412-252/+385
|/
* Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master'Clement Ho2017-11-146-10/+15
|\ | | | | | | | | Enable UnnecessaryMantissa in scss-lint See merge request gitlab-org/gitlab-ce!15255
| * Enable UnnecessaryMantissa in scss-lintTakuya Noguchi2017-11-096-10/+15
| |
* | 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 forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366
| * | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-143-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | In case the root project of a Fork-of-fork is deleted, the ForkNetwork and the membership for that fork network is never created. In this case we shouldn't try to create the membership, since the parent membership will never be created. This means that these fork networks will be lost.
* | | Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-143-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
| * | | 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 working Closes #39930 See merge request gitlab-org/gitlab-ce!15345
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
| * | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make sure all pipelines would go to pending once Closes #39884 See merge request gitlab-org/gitlab-ce!15251
| * | | | | | | Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-actionLin Jen-Shin2017-11-093-2/+32
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, pipeline could go from skipped to running directly, bypassing the transition for: [:created, :pending] => :running And this is responsible for setting up started_at. Without this fix, started_at would never be set. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39884
* | | | | | | Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-144-2/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Spinach deprecation" Closes #40127 See merge request gitlab-org/gitlab-ce!15365
| * | | | | | | | | Use #query_scope instead of #parent in a Spinach featureRémy Coutable2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-147-56/+116
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279
| * | | | | | | | | | 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. See merge request gitlab-org/gitlab-ce!15361
| * | | | | | | | | | | 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 modules See merge request gitlab-org/gitlab-ce!15355
| * | | | | | | | | | | 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 RPC Closes gitaly#722 See merge request gitlab-org/gitlab-ce!15307
| * | | | | | | | | | | 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. Closes #39933 and #31720 See merge request gitlab-org/gitlab-ce!15344
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize landing page for new users See merge request gitlab-org/gitlab-ce!15191
| * | | | | | | | | | | | 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 ↵Annabel Dunstone Gray2017-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdown' into 'master' Resolve "Wrong case for 'Roles' header in 'Allowed to create' project settings dropdown" Closes #37174 See merge request gitlab-org/gitlab-ce!15326
| * | | | | | | | | | | | 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) Closes #40068 See merge request gitlab-org/gitlab-ce!15341
View Lorry Controller Status