summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Simplify internal post receive messagesmk/simplify-internal-post-receive-messagesMichael Kozono2019-08-286-41/+238
| | | | | | | | Instead of sending varied data to Gitaly, and making Gitaly construct various messages, build the messages first and have Gitaly print either basic messages or alert messages, in the order they come. Depends on https://gitlab.com/gitlab-org/gitaly/merge_requests/1410
* Merge branch 'issue_40630' into 'master'Michael Kozono2019-08-2814-15/+406
|\ | | | | | | | | | | | | Save board lists collapsed setting Closes #52758 See merge request gitlab-org/gitlab-ce!31069
| * Save board lists collapsed settingFelipe Artur2019-08-2814-15/+406
|/ | | | Persists if a board list is collapsed for each user.
* Merge branch 'fix-search-input-dropdown-scss' into 'master'Paul Slaughter2019-08-283-6/+11
|\ | | | | | | | | | | | | Fix top-nav search bar dropdown on xl displays Closes #64120 and #66075 See merge request gitlab-org/gitlab-ce!31864
| * Fix top-nav search bar dropdown on xl displaysKemais Ehlers2019-08-283-6/+11
|/
* Merge branch 'jv-gitaly-workhorse-feature-flags' into 'master'Michael Kozono2019-08-284-3/+25
|\ | | | | | | | | | | | | Support Gitaly feature flags in workhorse Closes gitaly#1764 See merge request gitlab-org/gitlab-ce!31764
| * Support Gitaly feature flags in workhorseJacob Vosmaer2019-08-284-3/+25
|/
* Merge branch 'docs-nelbacha-improve-grammar-and-code' into 'master'Tom Atkins2019-08-281-2/+2
|\ | | | | | | | | Improve grammar and correct syntax in curl example See merge request gitlab-org/gitlab-ce!32163
| * Improve grammar and correct syntax in curl exampledocs-nelbacha-improve-grammar-and-codeNourdin el Bacha2019-08-231-2/+2
| |
* | Merge branch 'nelbacha-master-patch-08542' into 'master'Tom Atkins2019-08-281-1/+1
|\ \ | | | | | | | | | | | | improve grammar in Gitaly configuration See merge request gitlab-org/gitlab-ce!31605
| * | improve grammar in Gitaly configurationnelbacha-master-patch-08542Nourdin el Bacha2019-08-081-1/+1
| | |
* | | Merge branch 'docs/edit-limit-text' into 'master'Michael Kozono2019-08-282-8/+10
|\ \ \ | | | | | | | | | | | | | | | | Edit limit text See merge request gitlab-org/gitlab-ce!32318
| * | | Edit limit textdocs/edit-limit-textEvan Read2019-08-282-8/+10
| | | |
* | | | Merge branch 'an-use-non-deprecated-interceptor-name' into 'master'Nick Thomas2019-08-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename Labkit::Tracing::GRPCInterceptor to GRPC::ClientInterceptor See merge request gitlab-org/gitlab-ce!32230
| * | | | Rename Labkit::Tracing::GRPCInterceptor to GRPC::ClientInterceptorAndrew Newdigate2019-08-281-1/+1
|/ / / / | | | | | | | | | | | | The original name has been deprecated
* | | | Merge branch 'bump-pages-1-8' into 'master'Nick Thomas2019-08-282-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade pages to 1.8.0 See merge request gitlab-org/gitlab-ce!32334
| * | | | Upgrade pages to 1.8.0Vladimir Shushlin2019-08-282-1/+6
|/ / / /
* | | | Merge branch 'docs/update-textile-url' into 'master'Achilleas Pipinellis2019-08-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Textile documentation link See merge request gitlab-org/gitlab-ce!32326
| * | | | Update Textile documentation linkJesús Carmona Garrido2019-08-281-1/+1
| | | | |
* | | | | Merge branch 'add-sast-dast-artifact-path' into 'master'Rémy Coutable2019-08-281-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make sast & dast artifacts browseable See merge request gitlab-org/gitlab-ce!32219
| * | | | | Make sast & dast artifacts browseableadd-sast-dast-artifact-pathKyle Wiebers2019-08-271-0/+8
| | | | | |
* | | | | | Merge branch 'csslab-removal' into 'master'Clement Ho2019-08-2814-22/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove csslab Closes #66661 See merge request gitlab-org/gitlab-ce!32330
| * | | | | | Remove csslabArun Kumar Mohan2019-08-2814-22/+7
| | | | | | |
* | | | | | | 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. ```