summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entryYorick Peterse2019-07-221-1/+0
| | | | | This line is already present further down in the YAML file. In EE the line is already removed.
* Merge branch 'fix-metadata-script-broken-master' into 'master'Thong Kuah2019-07-221-1/+1
|\ | | | | | | | | Fix syntax error in script See merge request gitlab-org/gitlab-ce!30994
| * Fix syntax error in scriptfix-metadata-script-broken-masterHeinrich Lee Yu2019-07-221-1/+1
| |
* | Merge branch ↵Douwe Maan2019-07-224-1/+45
|\ \ | | | | | | | | | | | | | | | | | | '64697-markdown-issues-checkbox-inside-blockquote-status-won-t-be-saved' into 'master' Markdown issues: Checkbox inside blockquote status won't be saved See merge request gitlab-org/gitlab-ce!30952
| * | Properly identify task lists inside a blockquote64697-markdown-issues-checkbox-inside-blockquote-status-won-t-be-savedBrett Walker2019-07-194-1/+45
| | | | | | | | | | | | | | | Updated the task list regex to understand blockquote characters that can come before the task item marker
* | | Merge branch '63438-oauth2-support-with-gitlab-personal-access-token' into ↵Dmitriy Zaporozhets2019-07-226-16/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "OAuth2 support with GitLab personal access token" See merge request gitlab-org/gitlab-ce!30277
| * | | OAuth2 support for GitLab personal access tokensSteve Abrams2019-07-226-16/+50
|/ / / | | | | | | | | | | | | | | | PATs are accepted using the OAuth2 compliant header "Authorization: Bearer {token}" in order to allow for OAuth requests while 2FA is enabled.
* | | Update VERSION to 12.2.0-prev12.2.0.preGitLab Release Tools Bot2019-07-221-1/+1
| | |
* | | Update CHANGELOG.md for 12.1.0GitLab Release Tools Bot2019-07-22247-1240/+271
| | | | | | | | | [ci skip]
* | | Merge branch 'FixUnreleasedChangelog' into 'master'Sean McGivern2019-07-221-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Fix unreleased changelog "-30974-issue-search-by-number.yml" See merge request gitlab-org/gitlab-ce!30979
| * | Remove filename leading slash of -30974-issue-search-by-number.ymlPeter Dave Hello2019-07-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The leading slash will cause some not friendly command line behavier, for example: vim: ``` ~/gitlab-ce/changelogs/unreleased $ vim -30974-issue-search-by-number.yml VIM - Vi IMproved 7.4 (2013 Aug 10, compiled Jun 07 2019 15:35:43) Unknown option argument: "-30974-issue-search-by-number.yml" More info with: "vim -h" ``` git: ``` ~/gitlab-ce/changelogs/unreleased $ git add -30974-issue-search-by-number.yml error: unknown switch `3' usage: git add [<options>] [--] <pathspec>... -n, --dry-run dry run -v, --verbose be verbose -i, --interactive interactive picking -p, --patch select hunks interactively -e, --edit edit current diff and apply -f, --force allow adding otherwise ignored files -u, --update update tracked files -N, --intent-to-add record only the fact that the path will be added later -A, --all add changes from all tracked and untracked files --ignore-removal ignore paths removed in the working tree (same as --no-all) --refresh don't add, only refresh the index --ignore-errors just skip files which cannot be added because of errors --ignore-missing check if - even missing - files are ignored in dry run ``` There's no other unreleased changelog has a filename with leading slash, so I think this one should be corrected. cc !28302
| * | Fix merge_request value in -30974-issue-search-by-number.ymlPeter Dave Hello2019-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an syntax issue here which caused it can't be parsed properly. cc !28302 yaml-lint(https://www.npmjs.com/package/yaml-lint): ``` ✖ unknown tag !<!28302> at line 4, column 1: author: Riccardo Padovani ^ ``` Online YAML Parser:(https://yaml-online-parser.appspot.com/) ``` ERROR: could not determine a constructor for the tag '!28302' in "<unicode string>", line 3, column 16: merge_request: !28302 ... ^ ```
* | | Merge branch '64428-tests-are-not-split-optimally-by-knapsack' into 'master'Rémy Coutable2019-07-221-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upload new Knapsack report instead of merging Closes #64428 See merge request gitlab-org/gitlab-ce!30612
| * | | Upload new knapsack report instead of merging64428-tests-are-not-split-optimally-by-knapsackHeinrich Lee Yu2019-07-181-0/+1
| | | |
* | | | Merge branch '63833-fix-jira-issues-url' into 'master'Ash McKenzie2019-07-223-2/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle trailing slashes when generating issue URLs See merge request gitlab-org/gitlab-ce!30911
| * | | | Handle trailing slashes when generating Jira URLs63833-fix-jira-issues-urlHeinrich Lee Yu2019-07-223-2/+35
| | | | | | | | | | | | | | | | | | | | Applies to issues_url and new_issue_url
* | | | | Merge branch 'fix-search-project-in-boards-new-issue' into 'master'Kushal Pandya2019-07-221-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use the property of name_with_namespace instead of name for the new issue form in group boards See merge request gitlab-org/gitlab-ce!30021
| * | | | | use the property of name_with_namespace instead of name for the new issue ↵Emeryao2019-07-221-3/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | form in boards add a new attribute for name_with_namespace prettier the changed code
* | | | | Merge branch 'docs-mdl-info' into 'master'Evan Read2019-07-222-18/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add info about mdl to documentation See merge request gitlab-org/gitlab-ce!30792
| * | | | | Add info about mdl to documentationMarcel Amirault2019-07-222-18/+41
|/ / / / /
* | | | | Merge branch 'sl-qa-staging-65-fix-check-mentions-for-xss-spec' into 'master'Ramya Authappan2019-07-221-2/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Updates check_mentions_for_xss_spec to use admin token for creating the user Closes gitlab-org/quality/staging#65 See merge request gitlab-org/gitlab-ce!30943
| * | | | Create user as adminsl-qa-staging-65-fix-check-mentions-for-xss-specSanad Liaquat2019-07-191-2/+12
| | | | |
* | | | | Merge branch 'MattPennaThe3rd-EmailConf' into 'master'Evan Read2019-07-222-7/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for email confirmation signup restriction Closes #63060 See merge request gitlab-org/gitlab-ce!30968
| * | | | | Documentation for email confirmation signup restrictionMatt Penna2019-07-222-7/+16
|/ / / / /
* | | | | Merge branch 'docs/sast-analyzers' into 'master'Evan Read2019-07-222-0/+195
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document all the available options for SAST Closes gitlab-ee#10120 See merge request gitlab-org/gitlab-ce!30747
| * | | | | Document all the available options for SASTAchilleas Pipinellis2019-07-222-0/+195
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port all info from: - security-products/sast/blob/master/docs/README.md - security-products/sast/blob/master/docs/analyzers.md
* | | | | Merge branch ↵Evan Read2019-07-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64768-update-email-address-on-how-to-reset-your-root-password-docs' into 'master' Resolve "Update email address on How to reset your root password docs" Closes #64768 See merge request gitlab-org/gitlab-ce!30926
| * | | | | Update root default email address to current value64768-update-email-address-on-how-to-reset-your-root-password-docsastrachan2019-07-191-1/+1
| | | | | |
* | | | | | Merge branch 'docs-lists-cleanup-2' into 'master'Evan Read2019-07-2216-134/+128
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unordered list spacing (part 2) See merge request gitlab-org/gitlab-ce!30796
| * | | | | | Fix unordered list spacingMarcel Amirault2019-07-2216-134/+128
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the spacing of unordered markdown lists in docs, to maintain standards of documentation, in /user and others.
* | | | | | Merge branch 'qa/standardize-page-objects-use-on-ce-plan-tests' into 'master'Mark Lapierre2019-07-215-37/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize page objects use on CE Plan tests See merge request gitlab-org/gitlab-ce!30962
| * | | | | | Standardize Page Objects use on CE Plan Testsqa/standardize-page-objects-use-on-ce-plan-testsWalmyr Lima2019-07-205-37/+37
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first iteration to address the following issue: https://gitlab.com/gitlab-org/quality/team-tasks/issues/168 Note: depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30945
* | | | | | Merge branch 'wiki-usage-pings' into 'master'Douwe Maan2019-07-2112-16/+270
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Wiki Usage Ping for Create SMAU See merge request gitlab-org/gitlab-ce!30864
| * | | | | Count wiki page creationAlex Kalderimis2019-07-2112-16/+270
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a counter to count page creation, which is reflected in the usage-data we collect. The number created is stored in Redis, avoiding DB access.
* | | | | Merge branch 'qa/refactor-e2e-test' into 'master'64403-remove-node-polyfills-in-webpackDan Davison2019-07-191-11/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor collapse issue comments end-to-end test See merge request gitlab-org/gitlab-ce!30902
| * | | | | Refactor collapse comments end-to-end testqa/refactor-e2e-testWalmyr Lima2019-07-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To: - Better separate scopes (pre-conditions on before, tests on it) - Remove unnecessary expectation - Replace other unnecessary expectations by page.assert_text - Move variables closer to where they're used
* | | | | | Merge branch 'qa/refactor-create-issue-e2e-test' into 'master'Dan Davison2019-07-191-12/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor create issue end-to-end test See merge request gitlab-org/gitlab-ce!30945
| * | | | | | Refactor create issue end-to-end testqa/refactor-create-issue-e2e-testWalmyr Lima2019-07-191-12/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactor: - Moves the tests pre-conditions to a before blocks - Creates an issue via the api for the second test to improve the test suite performance
* | | | | | Merge branch 'patch-72' into 'master'Stan Hu2019-07-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes typo in developer documentation See merge request gitlab-org/gitlab-ce!30964
| * | | | | | Fixes typo in developer gotcha documentationJeremy Jackson2019-07-191-1/+1
| | | | | | |
* | | | | | | Merge branch '64731-fix-project-auto-devops-api' into 'master'Mayra Cabrera2019-07-195-21/+45
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix the project auto devops API See merge request gitlab-org/gitlab-ce!30946
| * | | | | | Fix the project auto devops APINick Thomas2019-07-195-21/+45
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `project_auto_devops.enabled` is nil for a project, when setting any auto devops values via the API, we try to create a new row in the DB, instead of re-using the existing one. This leads to the project_id being set to nil, and the database `NOT NULL` constraint leading to a 500 response. This commit resolves the issue by correctly detecting the presence of a ProjectAutoDevops row and re-using it. Persistence is also moved away from explicit `update!` calls and into relying on `autosave: true` on the model.
* | | | | | Merge branch 'sh-fix-gitaly-server-info-cache' into 'master'Mayra Cabrera2019-07-193-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gitaly auto-detection caching Closes #64802 See merge request gitlab-org/gitlab-ce!30954
| * | | | | | Fix Gitaly auto-detection cachingStan Hu2019-07-193-1/+19
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `GitalyClient#can_use_disk?` returned `false`, it was never cached properly and led to excessive number of Gitaly calls. Instead of using `cached_value.present?`, we need to check `cached_value.nil?`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64802
* | | | | | Merge branch '64160-fix-duplicate-buttons' into 'master'Fatih Acet2019-07-193-17/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate buttons Closes #64160 See merge request gitlab-org/gitlab-ce!30757
| * | | | | | Remove duplicate buttons64160-fix-duplicate-buttonsSamantha Ming2019-07-173-17/+19
| | | | | | |
* | | | | | | Merge branch 'tc-database-review-process' into 'master'Nick Thomas2019-07-1910-42/+196
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document database review process See merge request gitlab-org/gitlab-ce!30405
| * | | | | | | Document database review processToon Claes2019-07-1910-42/+196
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6069
* | | | | | | Merge branch '30939-remove-worker-label-from-ruby-sampler-metrics' into 'master'Kamil Trzciński2019-07-191-19/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of `worker_label` in RubySampler See merge request gitlab-org/gitlab-ce!30942
| * | | | | | | Get rid of `worker_label` in RubySampler30939-remove-worker-label-from-ruby-sampler-metricsAleksei Lipniagov2019-07-191-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have Prometheus::PidProvider which sets correct worker id for a process, so such implementation of `worker_label` in the sampler is obsolete.