summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fix branch name in case of new merge request cherry pickGeorge Andrinopoulos2018-08-191-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch '41441-add-target-branch-name-to-cherrypick-confirmation' of ↵George Andrinopoulos2018-08-190-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:geoandri/gitlab-ce into 41441-add-target-branch-name-to-cherrypick-confirmation
| | * | | | | | | | Add changelog fileGeorge Andrinopoulos2018-07-271-0/+5
| | | | | | | | | |
| | * | | | | | | | Fix failing testGeorge Andrinopoulos2018-07-271-1/+1
| | | | | | | | | |
| | * | | | | | | | Add target branch to cherry pick confirmation messageGeorge Andrinopoulos2018-07-253-6/+6
| | | | | | | | | |
| * | | | | | | | | Add changelog fileGeorge Andrinopoulos2018-08-191-0/+5
| | | | | | | | | |
| * | | | | | | | | Fix failing testGeorge Andrinopoulos2018-08-191-1/+1
| | | | | | | | | |
| * | | | | | | | | Add target branch to cherry pick confirmation messageGeorge Andrinopoulos2018-08-193-6/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'api-empty-commit-message' into 'master'Sean McGivern2018-08-223-18/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Catch empty commit messages Closes #50268, #50266, and #50265 See merge request gitlab-org/gitlab-ce!21322
| * | | | | | | | | | Extend to DELETE endpointRobert Schilling2018-08-211-5/+13
| | | | | | | | | | |
| * | | | | | | | | | Extend to PUT requestRobert Schilling2018-08-212-19/+23
| | | | | | | | | | |
| * | | | | | | | | | API: Catch empty commit messagesRobert Schilling2018-08-213-1/+18
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'api-empty-project-snippets' into 'master'Sean McGivern2018-08-223-2/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api empty project snippets Closes #50270 See merge request gitlab-org/gitlab-ce!21325
| * | | | | | | | | | | API: Catch empty code content for project snippetsRobert Schilling2018-08-213-2/+23
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'api-shared_group_expires-at' into 'master'Sean McGivern2018-08-225-2/+27
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add shared project's expiration date Closes #46107 See merge request gitlab-org/gitlab-ce!21104
| * | | | | | | | | | API: Add shared project's expiration dateapi-shared_group_expires-atRobert Schilling2018-08-215-2/+27
| |/ / / / / / / / /
* | | | | | | | | | Update VERSION to 11.3.0-prev11.3.0.preGitLab Release Tools Bot2018-08-221-1/+1
| | | | | | | | | |
* | | | | | | | | | Update CHANGELOG.md for 11.2.0GitLab Release Tools Bot2018-08-22217-1086/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'docs-update-ha-aws-diagram' into 'master'Mike Lewis2018-08-223-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs update ha aws diagram See merge request gitlab-org/gitlab-ce!21321
| * | | | | | | | | | Docs update ha aws diagramAchilleas Pipinellis2018-08-223-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'dz-fix-sql-error-admin-users-2fa' into 'master'Stan Hu2018-08-214-7/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix SQL error when sorting 2FA-enabled users by name in admin area See merge request gitlab-org/gitlab-ce!21324
| * | | | | | | | | | Add changelog for 2fa sorting in admin areaDmitriy Zaporozhets2018-08-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Fix SQL error when sorting 2FA-enabled users by name in admin areaDmitriy Zaporozhets2018-08-213-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'remove-scss-variables-4' into 'master'Clement Ho2018-08-2120-78/+53
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove another batch of reassigned scss variables See merge request gitlab-org/gitlab-ce!21334
| * | | | | | | | | | Remove another batch of reassigned scss variablesAnnabel Dunstone Gray2018-08-2120-78/+53
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'arguments-keyword-sast' into 'master'Mike Greiling2018-08-212-5/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use arguments keyword in gettext script Closes #50457 See merge request gitlab-org/gitlab-ce!21296
| * | | | | | | | | | | Don't use arguments keyword in gettext scriptgfyoung2018-08-192-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causing SAST build to fail unnecessarily. Follow-up to !19378.
* | | | | | | | | | | | Merge branch '50101-move-test-files' into 'master'Mike Greiling2018-08-2114-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves spec files for job log components into components folder See merge request gitlab-org/gitlab-ce!21303
| * | | | | | | | | | | Moves job log spec files to the components folder50101-move-test-filesFilipa Lacerda2018-08-2014-13/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '50524-artifacts-sm' into 'master'Annabel Gray2018-08-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Download artifacts button not available on mobile" Closes #50524 See merge request gitlab-org/gitlab-ce!21332
| * | | | | | | | | | | Shows download artifacts button for pipelines on small screensFilipa Lacerda2018-08-212-1/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'update-chart-for-ga-doc' into 'master'Achilleas Pipinellis2018-08-217-137/+217
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `gitlab` chart docs for GA See merge request gitlab-org/gitlab-ce!21215
| * | | | | | | | | | | Update `gitlab` chart docs for GAJoshua Lambert2018-08-217-137/+217
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'tc-api-fork-owners' into 'master'Grzegorz Bizon2018-08-216-37/+103
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow project owners to set up forking relation through API Closes #40550 See merge request gitlab-org/gitlab-ce!18104
| * | | | | | | | | | | Clean up LFS objects when creating fork relationToon Claes2018-08-203-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A forked project stores its LFS objects in the `forked_from_project`. So the LFS objects become inaccessible, and therefore delete them from the database so they'll get cleaned up. To be refactored when implementing https://gitlab.com/gitlab-org/gitlab-ce/issues/39769
| * | | | | | | | | | | Allow project owners to set up forking relation through APIToon Claes2018-08-204-37/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change only GitLab admins where allowed to set up forking relation through the API. This changes that so project owners can do this too. Closes gitlab-org/gitlab-ce#40550.
* | | | | | | | | | | | Merge branch '49993-fix-remember-sorting-issue-mr' into 'master'29398-support-kubernetes-rbac-for-gitlab-managed-apps-3Sean McGivern2018-08-214-17/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Separate remembering sorting issues/merge requests" Closes #49993 See merge request gitlab-org/gitlab-ce!21153
| * | | | | | | | | | | | Resolve "Separate remembering sorting issues/merge requests"🙈 jacopo beschi 🙉2018-08-214-17/+77
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ce-6752-jira-branches' into 'master'Sean McGivern2018-08-214-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of gitlab-org/gitlab-ee!6876 See merge request gitlab-org/gitlab-ce!21266
| * | | | | | | | | | | | Backport of gitlab-org/gitlab-ee!6876ce-6752-jira-branchesMario de la Ossa2018-08-204-1/+25
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '49179-fill-with-js-directly-qa' into 'master'Grzegorz Bizon2018-08-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[QA] Automation Triage 11.1.0 RC9 - Filling textarea with deploy key timeouts sometime" Closes #49179 See merge request gitlab-org/gitlab-ce!21258
| * | | | | | | | | | | | Fill variable text with JS directly to speed up49179-fill-with-js-directly-qaLin Jen-Shin2018-08-171-1/+7
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too slow to use `set(value)`, often timing out. Filling with JS is much faster for longer text, especially when the key size is larger than 8192. Before this patch: ``` Top 3 slowest examples (256.83 seconds, 89.4% of total time): cloning code using a deploy key user sets up a deploy key with QA::Runtime::Key::RSA(8192) to clone code using pipelines 161.26 seconds ./qa/specs/features/project/deploy_key_clone_spec.rb:42 cloning code using a deploy key user sets up a deploy key with QA::Runtime::Key::ECDSA(521) to clone code using pipelines 47.79 seconds ./qa/specs/features/project/deploy_key_clone_spec.rb:42 cloning code using a deploy key user sets up a deploy key with QA::Runtime::Key::ED25519() to clone code using pipelines 47.79 seconds ./qa/specs/features/project/deploy_key_clone_spec.rb:42 ``` Note that 161.26 was timed out. So it would actually take longer if it could ever complete. After patch: ``` Top 3 slowest examples (166.72 seconds, 83.8% of total time): cloning code using a deploy key user sets up a deploy key with QA::Runtime::Key::RSA(8192) to clone code using pipelines 83.66 seconds ./qa/specs/features/project/deploy_key_clone_spec.rb:42 cloning code using a deploy key user sets up a deploy key with QA::Runtime::Key::ECDSA(521) to clone code using pipelines 42.78 seconds ./qa/specs/features/project/deploy_key_clone_spec.rb:42 cloning code using a deploy key user sets up a deploy key with QA::Runtime::Key::ED25519() to clone code using pipelines 40.27 seconds ./qa/specs/features/project/deploy_key_clone_spec.rb:42 ``` Not that faster for smaller keys, but it's much faster for RSA 8192 (2 times faster). This was inspired from: https://github.com/teamcapybara/capybara/blob/679548cea10773d45e32808f4d964377cfe5e892/lib/capybara/selenium/node.rb#L217 Where it's clearing the field by filling an empty string. Here we do the same for the exact value we want to fill.
* | | | | | | | | | | | Merge branch 'fa-add_jira_specs' into 'master'Sean McGivern2018-08-211-121/+134
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JIRA service specs to commit object See merge request gitlab-org/gitlab-ce!21116
| * | | | | | | | | | | | Add JIRA service specs to commit objectFelipe Artur2018-08-211-121/+134
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '48869-wiki-slugs-with-spaces' into 'master'Sean McGivern2018-08-214-0/+149
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki: links with spaces in the url render incorrectly with CommonMark" See merge request gitlab-org/gitlab-ce!20417
| * | | | | | | | | | | | Resolve "Wiki: links with spaces in the url render incorrectly with CommonMark"Brett Walker2018-08-214-0/+149
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '50323-fix-clusters-application-prometheus-test' into 'master'Grzegorz Bizon2018-08-211-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix bad test from 20765 MR" Closes #50323 See merge request gitlab-org/gitlab-ce!21219
| * | | | | | | | | | | | Convert the #install_command spec to promethus#install_command as the subject50323-fix-clusters-application-prometheus-testThong Kuah2018-08-151-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes this consistent with the specs for other applications as well as fixing a bug in the 'application failed to install previously' spec
* | | | | | | | | | | | | Merge branch 'qa-staging-2' into 'master'Grzegorz Bizon2018-08-2111-39/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Improve the fork scenario to take a username and password instead of always… Closes gitlab-org/quality/staging#2 See merge request gitlab-org/gitlab-ce!21090
| * | | | | | | | | | | | | [QA] Improve the fork scenario to take a username and password instead of ↵qa-staging-2Rémy Coutable2018-08-2011-39/+114
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always creating a new user Fixes https://gitlab.com/gitlab-org/quality/staging/issues/2. Signed-off-by: Rémy Coutable <remy@rymai.me>