summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Backport EE changes to the qa/ directoryresolve-new-qa-differencesYorick Peterse2019-08-2917-0/+34
| | | | | Now that the qa/ directory uses the X_if_ee methods we can backport all these lines to CE.
* Fix InjectEnterpriseEditionModule cop for qa/Yorick Peterse2019-08-282-1/+20
| | | | | | | This ensures the InjectEnterpriseEditionModule cop is able to detect the prepend patterns used in the qa/ directory. Previously it would not detect them as all EE QA modules reside in QA::EE, and not the top-level EE namespace.
* Merge branch 'update-gitlab-runner-helm-chart-to-0-8-0' into 'master'Kamil Trzciński2019-08-282-1/+6
|\ | | | | | | | | Update GitLab Runner Helm Chart to 0.8.0/12.2.0 See merge request gitlab-org/gitlab-ce!32289
| * Update GitLab Runner Helm Chart to 0.8.0update-gitlab-runner-helm-chart-to-0-8-0Tomasz Maczukin2019-08-272-1/+6
| |
* | Merge branch '9074-use-only-projects-with-sec-reports-enabled-in-gsd-ce' ↵Kamil Trzciński2019-08-2811-18/+70
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Update CE files for gitlab-ee!15334 See merge request gitlab-org/gitlab-ce!32046
| * | Update CE files for GSD projects filterVictor Zagorodny2019-08-2811-18/+70
|/ / | | | | | | | | | | | | | | | | A new param with_security_reports was added to GET /groups/:id/projects API and the code to support this logic in GroupProjectsFinder and Project model. Also, a DB index was added to ci_job_artifacts table to speed up the search of security reports artifacts for projects
* | Merge branch 'use-structured-logging-for-db-load-balancer-ce' into 'master'Achilleas Pipinellis2019-08-281-0/+9
|\ \ | | | | | | | | | | | | Add docs for new log file See merge request gitlab-org/gitlab-ce!32051
| * | Add docs for new log fileHordur Freyr Yngvason2019-08-281-0/+9
|/ /
* | Merge branch '57538-not-null-constraint-on-users-private-profile' into 'master'Andreas Brandl2019-08-284-2/+33
|\ \ | | | | | | | | | | | | | | | | | | Migrate users.private_profile to disallow NULL values Closes #57538 See merge request gitlab-org/gitlab-ce!29941
| * | Adding NOT NULL constraint to private_profileAdam Hegyi2019-08-284-2/+33
|/ / | | | | | | | | | | This change sets NOT NULL constraint to users.private profile. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57538
* | Merge branch '64574-docs' into 'master'Achilleas Pipinellis2019-08-2814-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Docs: Update Screenshots for protected tags and branches. Closes #64574 See merge request gitlab-org/gitlab-ce!32262
| * | Docs: Update Screenshots for protected tags and branches.Stefan Schmalzhaf2019-08-2814-6/+6
|/ /
* | Merge branch 'docs/rs-root-parity' into 'master'Yorick Peterse2019-08-284-8/+18
|\ \ | | | | | | | | | | | | CE-EE parity for root files See merge request gitlab-org/gitlab-ce!32287
| * | Unify RuboCop configurationdocs/rs-root-parityRobert Speicher2019-08-271-1/+4
| | |
| * | Unify PHILOSOPHY.mdRobert Speicher2019-08-271-1/+4
| | |
| * | Remove README.md differencesRobert Speicher2019-08-271-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Test coverage badges can be added at the Project level in GitLab and don't need to be in the README. The logo was gigantic, unable to be resized, and unnecessary in the README.
| * | Assimilate EE-specific CI variablesRobert Speicher2019-08-271-0/+3
| | | | | | | | | | | | Having these defined in both CE and EE won't hurt anything.
* | | Merge branch 'add-rubocop-check-for-be-success' into 'master'Grzegorz Bizon2019-08-284-0/+126
|\ \ \ | | | | | | | | | | | | | | | | Add rubocop check for be success See merge request gitlab-org/gitlab-ce!32091
| * | | Replace it_behaves_like with include_examplesadd-rubocop-check-for-be-successVitali Tatarintev2019-08-281-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Improve specs output readability by replacing `it_behaves_like` with `include_examples` in `BeSuccessMatcher`
| * | | 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
View Lorry Controller Status