summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve QA scenarios contexts & descriptions consistency49800-reorganize-qa-scenariosRémy Coutable2018-08-2625-630/+721
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Reorganize QA scenarios based on the DevOps cycleRémy Coutable2018-08-2632-0/+49
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Allow to pass --tag to bin/qa runRémy Coutable2018-08-265-5/+24
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'sh-insert-git-data-in-separate-transaction' into 'master'Yorick Peterse2018-08-264-8/+98
|\ | | | | | | | | Bitbucket Server importer: Eliminate most idle-in-transaction issues See merge request gitlab-org/gitlab-ce!21173
| * Bitbucket Server importer: Eliminate most idle-in-transaction issuesStan Hu2018-08-264-8/+98
| | | | | | | | | | | | | | | | | | | | | | Just like with the GitHub importer, the Bitbucket Server importer can hit the default 60 s idle-in-transaction timeouts if it takes too long to create the merge request. We solve this by using the same approach as the GitHub importer: 1. Bypass all validation and hooks in creating a merge request 2. Insert the Git data in a separate transaction Part of #50021
* | Merge branch 'sh-sanitize-project-import-names' into 'master'Rémy Coutable2018-08-267-4/+23
|\ \ | | | | | | | | | | | | Use slugs for default project path and sanitize names before import See merge request gitlab-org/gitlab-ce!21367
| * | Use slugs for default project path and sanitize names before importStan Hu2018-08-247-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Users importing from Bitbucket Cloud, Bitbucket Server, or GitHub often complained about getting failed imports due to 422 errors. This change ensures that project names are imported with names that are guaranteed to pass the regular expression validation. Part of #50021
* | | Merge branch '6028-show-generic-percent-stacked-progress-bar' into 'master'Filipa Lacerda2018-08-263-2/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show `< 1%` when percent value evaluated is less than 1 on Stacked Progress Bar Closes gitlab-ee#6028 See merge request gitlab-org/gitlab-ce!21306
| * | | Add changelog entry6028-show-generic-percent-stacked-progress-barKushal Pandya2018-08-201-0/+6
| | | |
| * | | Show `< 1%` when percent value evaluated is less than 1Kushal Pandya2018-08-202-2/+10
| | | |
* | | | Merge branch 'make-qa-scenario-test-instance-back-compatible' into 'master'Grzegorz Bizon2018-08-262-0/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [QA] Re-add Test::Instance for back-compatibility with GitLab < 11.3 See merge request gitlab-org/gitlab-ce!21339
| * | | | [QA] Re-add Test::Instance for back-compatibility with GitLab < 11.3Rémy Coutable2018-08-222-0/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'ml-test-plan-issue-template' into 'master'Mek Stittri2018-08-261-0/+96
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Test plan issue template See merge request gitlab-org/gitlab-ce!21227
| * | | | | Add Test plan issue templateml-test-plan-issue-templateMark Lapierre2018-08-171-0/+96
| | | | | |
* | | | | | Merge branch '49110-update-mr-widget-styles' into 'master'Filipa Lacerda2018-08-2611-75/+324
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Follow up to "Styling of the MR widget's info and pipeline sections"" Closes #49110 See merge request gitlab-org/gitlab-ce!21206
| * | | | | | Add changelog49110-update-mr-widget-stylesPaul Slaughter2018-08-211-0/+5
| | | | | | |
| * | | | | | Generate a fresh potPaul Slaughter2018-08-211-0/+3
| | | | | | |
| * | | | | | Update mr_widget_header to not show branch names in 'commits behind' textPaul Slaughter2018-08-213-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Increased presence of 'commits behind' text - Added link to target branch in 'commits behind' text
| * | | | | | Update MR deployment to use .label-truncate with .deploy-linkPaul Slaughter2018-08-212-7/+18
| | | | | | |
| * | | | | | Update MR header and pipeline to use .label-truncate with .label-branchPaul Slaughter2018-08-214-55/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Renamed .label-truncated to .label-truncate - Removed length checking in JS to let the CSS handle this - Improve IE11 compatibility of MR headers
| * | | | | | Create TooltipOnTruncate component to show tooltip only when neededPaul Slaughter2018-08-212-0/+229
| | | | | | |
| * | | | | | Create 'mountComponentWithRender' for testing with slotsPaul Slaughter2018-08-211-0/+10
| | | | | | |
* | | | | | | Merge branch 'api-protected-tags' into 'master'Nick Thomas2018-08-2512-4/+531
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Protected tags Closes #39144 See merge request gitlab-org/gitlab-ce!14986
| * | | | | | | API: Protected tagsRobert Schilling2018-08-2512-4/+531
|/ / / / / / /
* | | | | | | Merge branch '50345-hashed-storage-feature-flag' into 'master'Nick Thomas2018-08-258-3/+125
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature flag to disable Hashed Storage migration when renaming a repository Closes #50345 See merge request gitlab-org/gitlab-ce!21291
| * | | | | | | Rename feature flag to skip_hashed_storage_upgrade to be less confusing50345-hashed-storage-feature-flagGabriel Mazetto2018-08-223-6/+6
| | | | | | | |
| * | | | | | | Fixed `stub_feature_flag behavior` for `disabled?` flags.Gabriel Mazetto2018-08-227-2/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code would not work with `disabled?` because that method would send two parameters (second always `nil`) which we are not mocking. Instead of mock yet another state, I decide to fix it where it belongs.
| * | | | | | | Add FeatureFlag to disable hashed storage migration when renamingGabriel Mazetto2018-08-222-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We usually want a feature flag to be disabled by default and hide the feature until it's enabled. This is an unconventional use: when the flag is enabled, it will "DISABLE" the behavior.
* | | | | | | | Merge branch 'winh-danger-changelog-drop-wip' into 'master'Rémy Coutable2018-08-241-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop WIP from changelog command in Danger comment See merge request gitlab-org/gitlab-ce!21374
| * | | | | | | | Drop WIP from changelog command in Danger commentWinnie Hellmann2018-08-241-2/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'dz-refactor-project-permissions-helper-method' into 'master'Rémy Coutable2018-08-242-3/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Refactor project_permissions_panel_data so it can be extended in EE easily See merge request gitlab-org/gitlab-ce!21370
| * | | | | | | Refactor project_permissions_panel_data so it can be extended in EE easilyDmitriy Zaporozhets2018-08-242-3/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'sh-simplify-github-importer-refactor' into 'master'Yorick Peterse2018-08-249-133/+173
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor GitHub Importer database helpers into helper methods See merge request gitlab-org/gitlab-ce!21357
| * | | | | | | Refactor GitHub Importer database helpers into helper methodsStan Hu2018-08-249-133/+173
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This in preparation for addressing idle-in-transaction timeouts for other importers. Part of #50021
* | | | | | | Merge branch 'mkoszut-master-patch-04745' into 'master'Rémy Coutable2018-08-241-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing not necessarily indentations in update Ruby code block See merge request gitlab-org/gitlab-ce!21364
| * | | | | | | Removing not necessarily indentations in update Ruby code blockMateusz2018-08-231-10/+10
| | | | | | | |
* | | | | | | | Merge branch 'fix/contributing' into 'master'Rémy Coutable2018-08-241-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [docs] Update CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!21355
| * | | | | | | | Update CONTRIBUTING.mdFranklin Yu2018-08-231-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'api-labels-spec' into 'master'Rémy Coutable2018-08-241-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POST should be PUT in the API labels specs See merge request gitlab-org/gitlab-ce!21369
| * | | | | | | | | POST should be PUT in the API labels specsRobert Schilling2018-08-241-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-28' into 'master'Stan Hu2018-08-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to Profiling doc to README See merge request gitlab-org/gitlab-ce!21345
| * | | | | | | | | | Add link to Profiling doc to READMETom Atkins2018-08-241-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ccr/43283_allow_author_upvote' into 'master'Sean McGivern2018-08-2413-91/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows author to vote on their own issue See merge request gitlab-org/gitlab-ce!21203
| * | | | | | | | | | Allows author to vote on their own issueChantal Rollison2018-08-2413-91/+31
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2018-08-241-23/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation: fixes to source installation instructions Closes #47483 See merge request gitlab-org/gitlab-ce!21359
| * | | | | | | | | | Gitaly needs to be installed before initializing databaseAniela Ziółkowski2018-08-231-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "/home/git/repositories" in arguments causes Gitaly installation to fail
| * | | | | | | | | | Update installation.mdAniela Ziółkowski2018-08-231-1/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-issue-50562' into 'master'Rémy Coutable2018-08-245-0/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix remote mirrors failing if Git remotes have not been added Closes #50562 See merge request gitlab-org/gitlab-ce!21351
| * | | | | | | | | | Fix remote mirrors failing if Git remotes have not been addedStan Hu2018-08-225-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remote mirrors only get created when the URL changes, However, during the GCP migration, the remote mirror did not get created automatically. Plus, there's no guarantee someone restoring a repository from backup would have this remote. We now add the remote each time we attempt to fetch from the repository. This works because Gitaly doesn't throw up an exception or error if the remote already exists: https://gitlab.com/gitlab-org/gitaly/issues/1317 In the future, we should attempt to add if the remote doesn't exist: https://gitlab.com/gitlab-org/gitaly/issues/1316 Closes #50562
* | | | | | | | | | | Merge branch 'winh-fix-dummy-badge-id' into 'master'Fatih Acet2018-08-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix transient failure of badge_list_spec.js See merge request gitlab-org/gitlab-ce!21363