summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Remove Rubocop::SpecHelper fileVitali Tatarintev2019-08-283-37/+0
| | | | | | | | | | |
| * | | | | | | | | | Inline shared examples for BeSuccessMatcherVitali Tatarintev2019-08-281-40/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Former shared examples were used only once. Inlining them makes tests more clear.
| * | | | | | | | | | Refactor BeSuccessMatcher specs for readabilityVitali Tatarintev2019-08-283-34/+34
| | | | | | | | | | |
| * | | | | | | | | | Utilize Rubocop's Include for BeSuccessMatcherVitali Tatarintev2019-08-284-43/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rubocop's Include instead of manually checking the matcher in controllers specs.
| * | | | | | | | | | Add support of not_to/to_not to BeSuccessMatcherVitali Tatarintev2019-08-282-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BeSuccessMatcher now supports following examples: ``` expect(response).to be_success expect(response).to_not be_success expect(response).not_to be_success is_expected.to be_success is_expected.to_not be_success is_expected.not_to be_success ```
| * | | | | | | | | | Refactor BeSuccessMatcher specsVitali Tatarintev2019-08-281-36/+25
| | | | | | | | | | |
| * | | | | | | | | | Replace double quotes with single quotesVitali Tatarintev2019-08-282-11/+11
| | | | | | | | | | |
| * | | | | | | | | | Enable frozen string literalVitali Tatarintev2019-08-282-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Autocorrect `be_success` to `be_successful`Vitali Tatarintev2019-08-282-0/+16
| | | | | | | | | | |
| * | | | | | | | | | Add Rubocop check to avoid using `be_success`Vitali Tatarintev2019-08-284-0/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent using `be_success` call in controller specs to avoid getting following deprecation warning: ``` DEPRECATION WARNING: The success? predicate is deprecated and will be removed in Rails 6.0. Please use successful? as provided by Rack::Response::Helpers. ```
* | | | | | | | | | | Merge branch 'sh-lfs-object-batches' into 'master'Rémy Coutable2019-08-284-5/+48
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes LFS object link process OIDs in batches Closes #66274 See merge request gitlab-org/gitlab-ce!32268
| * | | | | | | | | | | Makes LFS object linker process OIDs in batchessh-lfs-object-batchesStan Hu2019-08-274-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a project import, `LfsLinkService` attempts to link `LfsObjects` that have not already been associated with a project. It's possible for a large repo to have thousands of OIDs, which can cause long database query and parsing times. By processing a batch of 1000 at a time, we can reduce that time at the expense of a few more SQL queries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66274
* | | | | | | | | | | | Merge branch 'query-recorder-apply-bindings' into 'master'Grzegorz Bizon2019-08-281-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply bindings to queries from QueryRecorder See merge request gitlab-org/gitlab-ce!31689
| * | | | | | | | | | | | Apply bindings to querys from QueryRecorderDavid Wilkins2019-08-281-1/+4
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - local tests that assume certain parameters to queries from QueryRecorder fail. These same tests don't fail in the runners, and I can't tell why. This fixes the local failures
* | | | | | | | | | | | Merge branch 'sh-upgrade-mermaid-8.2.4' into 'master'Filipa Lacerda2019-08-284-63/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Mermaid to v8.2.4 See merge request gitlab-org/gitlab-ce!32186
| * | | | | | | | | | | Upgrade Mermaid to v8.2.4sh-upgrade-mermaid-8.2.4Stan Hu2019-08-254-63/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression that does not permit spaces in subgraph titles. Full details: https://github.com/knsv/mermaid/releases
* | | | | | | | | | | | Merge branch '35060-remove-token-field' into 'master'Filipa Lacerda2019-08-284-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove token field from runners edit form Closes #35060 See merge request gitlab-org/gitlab-ce!32231
| * | | | | | | | | | | | Remove token field from runners edit formPayton Burdette2019-08-284-12/+5
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Remove unnecessary test checking for form value Translations updated for gitlab.pot Use proper format on changelog entry
* | | | | | | | | | | | Merge branch 'id-change-total-notes-calculation' into 'master'Ash McKenzie2019-08-285-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the way totalNotes is calculated See merge request gitlab-org/gitlab-ce!32191
| * | | | | | | | | | | | Change the way totalNotes is calculatedid-change-total-notes-calculationIgor Drozdov2019-08-285-4/+28
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | totalNotes is only used to prerender a number of skeleton containers until real notes are loaded issuable.discussions makes multiple requests, so too expensive for this This commit uses mere notes for this and sends actual totalNotes number if it's less than 10; otherwise it sends 10 - it allows us to avoid bunch of skeleton prerenderings, which are not necessary since they doesn't fit into the whole screen and disappear quite fast
* | | | | | | | | | | | Merge branch 'sh-fix-issue-move-api' into 'master'Grzegorz Bizon2019-08-284-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix moving issues API failing when text includes commit URLs Closes #66666 See merge request gitlab-org/gitlab-ce!32317
| * | | | | | | | | | | Fix moving issues API failing when text includes commit URLssh-fix-issue-move-apiStan Hu2019-08-284-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a issue is moved from one project to another, all associated Markdown text is rewritten in the context of the new project. If the note contained a link to a commit URL, `CommitRewriter#rewrite` would fail because `Commit#link_reference_pattern` would match `nil` `commit` values in the HTML generated from the Markdown. These `nil` values were passed along to `Project#commits_by` because `Commit#reference_valid?` was always returning `true`. To prevent this issue from happening, we tighten up the check for `Commit#reference_valid?` to look for valid SHA values. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66666
* | | | | | | | | | | | Merge branch 'user-tracking-settings' into 'master'Jan Provaznik2019-08-288-105/+204
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusts snowplow to use cookies for sessions Closes telemetry#77 See merge request gitlab-org/gitlab-ce!32236
| * | | | | | | | | | | | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-288-105/+204
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also restructures how and where the configuration for Snowplow lives.
* | | | | | | | | | | | Merge branch 'docs/license-compliance-rename' into 'master'Evan Read2019-08-2817-254/+257
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename all filenames and occurrences to License Compliance See merge request gitlab-org/gitlab-ce!32148
| * | | | | | | | | | | | Rename all filenames and occurrences to License ComplianceAchilleas Pipinellis2019-08-2817-254/+257
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New redirect doc/user/application_security/license_compliance/index.md - Renaming of images. - Some links that were pointing to the old location are fixed.
* | | | | | | | | | | | Merge branch 'docs/unlinking-emails' into 'master'Evan Read2019-08-281-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a section for a now fixed bug See merge request gitlab-org/gitlab-ce!32319
| * | | | | | | | | | | Remove a section for a now fixed bugAchilleas Pipinellis2019-08-281-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those guidelines where based on https://gitlab.com/gitlab-org/gitlab-docs/issues/311 which seems to be fixed.
* | | | | | | | | | | | Merge branch 'docs/edit-feature-flags' into 'master'Achilleas Pipinellis2019-08-281-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit Feature Flags topic See merge request gitlab-org/gitlab-ce!31956
| * | | | | | | | | | | | Edit Feature Flags topicEvan Read2019-08-281-13/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-markdownlint-fixes-1' into 'master'Achilleas Pipinellis2019-08-2829-94/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown in various docs (part 1) See merge request gitlab-org/gitlab-ce!32267
| * | | | | | | | | | | Fix markdown in various docsMarcel Amirault2019-08-2829-94/+68
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up issues that may cause the docs-lint test to fail, such as trailing whitespace, no EOF newline, blockquotes, etc
* | | | | | | | | | | Merge branch 'docs/fix-introduced-in-text' into 'master'Achilleas Pipinellis2019-08-288-27/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Introduced in text for our renderer See merge request gitlab-org/gitlab-ce!32308
| * | | | | | | | | | Fixes Introduced in text for our rendererEvan Read2019-08-288-27/+28
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'mk/remove-jwt-from-rate-limit-docs' into 'master'Evan Read2019-08-282-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note CI token exception to JWT requests in rate limit docs See merge request gitlab-org/gitlab-ce!32168
| * | | | | | | | | | Note some JWT requests aren't rate limitedmk/remove-jwt-from-rate-limit-docsMichael Kozono2019-08-232-1/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu2019-08-2810-60/+90
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
| * | | | | | | | | Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan2019-08-2710-60/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* | | | | | | | | | Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'Sanad Liaquat2019-08-286-4/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of EE changes See merge request gitlab-org/gitlab-ce!32203
| * | | | | | | | | | CE Backport of EE changesqa-restric-access-by-ip-address-spec-ceSanad Liaquat2019-08-276-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qa selector elements and files from the EE branch
* | | | | | | | | | | Merge branch 'docs-patch-74' into 'master'Evan Read2019-08-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove eks from adding an existing cluster section See merge request gitlab-org/gitlab-ce!32125
| * | | | | | | | | | | Remove eks from adding an existing cluster sectionDaniel Gruesso2019-08-281-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ss/add-board-name-to-page-title' into 'master'Mike Greiling2019-08-282-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ss/add board name to page title See merge request gitlab-org/gitlab-ce!32074
| * | | | | | | | | | | Ss/add board name to page titleScott Stern2019-08-282-1/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-gitlab-basics-followup' into 'master'Evan Read2019-08-283-4/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolving minor formatting issues in gitlab-basics Closes #65307 See merge request gitlab-org/gitlab-ce!32194
| * | | | | | | | | | | Resolving minor formatting issues in gitlab-basicsMarcel Amirault2019-08-283-4/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-refactor-dev-org-com-helper' into 'master'Ash McKenzie2019-08-282-1/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename dev, org, com helper See merge request gitlab-org/gitlab-ce!32115
| * | | | | | | | | | Rename dev, org, com helperDoug Stull2019-08-282-1/+28
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '10688-group-maintainers-edit-epic-comments-permissions-docs' ↵Evan Read2019-08-281-18/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update group permissions table documentation See merge request gitlab-org/gitlab-ce!32020
| * | | | | | | | | | Update group permissions table documentationEugenia Grieff2019-08-281-18/+20
|/ / / / / / / / / /
View Lorry Controller Status