summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds Sidekiq scheduling latency structured logging fieldan-sidekiq-scheduling_latencyAndrew Newdigate2019-07-303-5/+50
|
* Merge branch 'Jenkins_Integration_Mktg_Docs_Page_Update_20190729' into 'master'Evan Read2019-07-301-0/+3
|\ | | | | | | | | Update jenkins.md - add CTA to about.gitlab page See merge request gitlab-org/gitlab-ce!31259
| * Update jenkins.md - add CTA to about.gitlab pageAgnes Oetama2019-07-301-0/+3
|/
* Merge branch 'docs-ci-examples-fix-typo' into 'master'Evan Read2019-07-301-1/+1
|\ | | | | | | | | documentation: fix a typo in ci/examples See merge request gitlab-org/gitlab-ce!31250
| * Doc: ci: examples: fix typo EnvoyRomain Aviolat2019-07-291-1/+1
| | | | | | | | | | This commit fixes a typo in the ci/examples documentation
* | Merge branch 'docs-ssot-gitlab-basics-1' into 'master'Evan Read2019-07-3011-310/+396
|\ \ | | | | | | | | | | | | | | | | | | Raise /gitlab-basics to SSoT Docs standards Closes #65153 See merge request gitlab-org/gitlab-ce!31172
| * | First pass to bring /gitlab-basics to SSoT standardsMarcel Amirault2019-07-3011-310/+396
|/ / | | | | | | | | | | | | | | | | Removes duplicated information, and combines sections and files together when they are duplicated or highly related. Also adds intros to all pages and sections missing intros, and troubleshooting sections to pages that may need them in the future. Links more to other docs, and clarifies language when abosolutely necessary, and adds angle brackets to sample parameters.
* | Merge branch 'qa-mattermost-spec-retry' into 'master'Sanad Liaquat2019-07-301-4/+6
|\ \ | | | | | | | | | | | | Add retry on exception to mattermost login spec See merge request gitlab-org/gitlab-ce!31243
| * | Add retry on exception to mattermost loginqa-mattermost-spec-retryDesiree Chevalier2019-07-291-4/+6
| | |
* | | Merge branch 'manual-sorting-12-2' into 'master'Evan Read2019-07-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Correct manual sort introduction release See merge request gitlab-org/gitlab-ce!31135
| * | | Correct manual sort introduction releasemanual-sorting-12-2Sean McGivern2019-07-251-1/+1
| | | |
* | | | Merge branch 'docs-dependency-scanning-gradle' into 'master'Evan Read2019-07-301-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gradle to not-yet-supported list Closes gitlab-ee#12393 See merge request gitlab-org/gitlab-ce!31228
| * | | | Add gradle to not-yet-supported listMarcel Amirault2019-07-301-5/+6
|/ / / /
* | | | Merge branch 'codyw-docs-visbility-levels' into 'master'Evan Read2019-07-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update visibility level docs See merge request gitlab-org/gitlab-ce!31258
| * | | | Update visibility level doccodyw-docs-visbility-levelsCody West2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | Adding parenthetical about guest users not being able to view private projects.
* | | | | Merge branch 'determinstic_dns_specs' into 'master'Douglas Barbosa Alexandre2019-07-307-13/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Have deterministic DNS for specs See merge request gitlab-org/gitlab-ce!31086
| * | | | | Stub DNS to return IPv4 addressdeterminstic_dns_specsThong Kuah2019-07-292-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise certain machines return IPv6 first, which is non-deterministic
| * | | | | Explicitly reject non http(s) schemesThong Kuah2019-07-292-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | Rather than relying on NoMethodError deep inside faraday
| * | | | | Write out sham_rack gemThong Kuah2019-07-294-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we have one less Net::HTTP monkeypatch. sham_rack cannot handle IPv6 addresses which means it breaks Net::HTTP connections because it monkey-patches Net::HTTP
* | | | | | Merge branch 'docs-OAuth2-scopes' into 'master'Evan Read2019-07-301-6/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add requesting particular OAuth2 scopes details Closes #65200 See merge request gitlab-org/gitlab-ce!31215
| * | | | | | Add requesting particular OAuth2 scopes detailsdocs-OAuth2-scopesBen Bodenmiller2019-07-271-6/+12
| | | | | | |
* | | | | | | Merge branch 'mc/doc/document-codeclimate-security-best-practice-docs' into โ†ตEvan Read2019-07-291-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Document Code Quality potential security flaw Closes #37980 See merge request gitlab-org/gitlab-ce!31197
| * | | | | | | Document Code Quality potential security flawmc/doc/document-codeclimate-security-best-practice-docsMatija ฤŒupiฤ‡2019-07-291-0/+6
| | | | | | | |
* | | | | | | | Merge branch 'docs-troubleshoot-scim' into 'master'Evan Read2019-07-291-10/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds troubleshooting guidance to SAML SCIM setup docs See merge request gitlab-org/gitlab-ce!28921
| * | | | | | | | Adds troubleshooting guidance to SAML SCIM setup docsDeAndre Harris2019-07-291-10/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-update-rouge-3.7.0' into 'master'Thong Kuah2019-07-294-4/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rouge to v3.7.0 Closes #64625 See merge request gitlab-org/gitlab-ce!31254
| * | | | | | | | Update rouge to v3.7.0Stan Hu2019-07-294-4/+9
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for a number of new languages (e.g. Ada) and fixes a number of lexers: https://github.com/rouge-ruby/rouge/compare/v3.5.1..v3.7.0 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64625
* | | | | | | | Merge branch 'docs/ssot_repository' into 'master'Evan Read2019-07-296-69/+151
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to Repository docs for SSOT epic See merge request gitlab-org/gitlab-ce!31075
| * | | | | | | | Changes to Repository docs for SSOT epicRussell Dickenson2019-07-296-69/+151
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Content about Repository was edited to comply with docs standards. This is part of a SSOT epic. - Added standard elements to each file. - Moved content on Branches, and Compare, to the Branches file. - Added a brief introduction piece to the GPG content. - Lightly edited all content to improve clarity.
* | | | | | | | Merge branch โ†ตRobert Speicher2019-07-2914-2/+196
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issue' into 'master' Resolve "Add system notes for when a zoom call was added/removed from an issue" Closes #63547 See merge request gitlab-org/gitlab-ce!30857
| * | | | | | | | Add system notes for when a zoom call was added/removed from an issue63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issueJacopo2019-07-2914-2/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a zoom link added / removed system note when a zoom link is being added / removed to the issue description.
* | | | | | | | | Merge branch 'reorganize-metrics-dashboard' into 'master'Thong Kuah2019-07-2914-246/+238
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize metrics dashboard See merge request gitlab-org/gitlab-ce!31006
| * | | | | | | | | Move BaseService to Services directorySarah Yasonik2019-07-2914-246/+238
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for embedding specific metrics in issues https://gitlab.com/gitlab-org/gitlab-ce/issues/62971, this commit moves the BaseService for metrics dashboards to a new services subdirectory. This is purely for the sake of organization and maintainability.
* | | | | | | | | Merge branch '56100-make-quick-action-commands-applied-banner-more-useful' โ†ตMayra Cabrera2019-07-2922-151/+917
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Make quick action "commands applied" banner more useful" Closes #56100 See merge request gitlab-org/gitlab-ce!26672
| * | | | | | | | | Make quick action "commands applied" banner more useful๐Ÿ™ˆ jacopo beschi ๐Ÿ™‰2019-07-2922-151/+917
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the quick actions "commands applied" banner to show the quick action preview text, but with everything in past tense.
* | | | | | | | | Merge branch โ†ตMayra Cabrera2019-07-293-6/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64180-membersfinder-contains-slow-database-query-with-or-conditions' into 'master' Resolve "MembersFinder contains slow database query with OR conditions" Closes #64180 See merge request gitlab-org/gitlab-ce!30451
| * | | | | | | | Resolve "MembersFinder contains slow database query with OR conditions"๐Ÿ™ˆ jacopo beschi ๐Ÿ™‰2019-07-293-6/+13
|/ / / / / / / /
* | | | | | | | Merge branch 'alerts-dropdown-to-modal-ce' into 'master'Fatih Acet2019-07-292-1/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Alerts dropdown to modal - CE1 See merge request gitlab-org/gitlab-ce!31036
| * | | | | | | Alerts dropdown to modal - CE1Simon Knox2019-07-292-1/+9
|/ / / / / / /
* | | | | | | Merge branch 'fj-fix-broken-master-url-blocker' into 'master'Mayra Cabrera2019-07-291-5/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken master because of security merge Closes #65294 See merge request gitlab-org/gitlab-ce!31252
| * | | | | | | Fix broken master because of security mergeFrancisco Javier Lรณpez2019-07-291-5/+2
|/ / / / / / /
* | | | | | | Merge branch 'sh-update-rugged-0.28.2' into 'master'Douglas Barbosa Alexandre2019-07-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Rugged to 0.28.2 See merge request gitlab-org/gitlab-ce!31218
| * | | | | | | Update Rugged to 0.28.2sh-update-rugged-0.28.2Stan Hu2019-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bug fix release: https://github.com/libgit2/libgit2/releases
* | | | | | | | Merge branch 'tp-qtt182-6' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change qa-merge-request-settings to rspec-merge-request-settings Closes gitlab-org/quality/team-tasks#182 See merge request gitlab-org/gitlab-ce!31207
| * | | | | | | | Change qa-* class references to rspec-*tp-qtt182-6Tanya Pazitny2019-07-262-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'tp-qtt182-9' into 'master'Mayra Cabrera2019-07-297-11/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change qa-* class references to js-* for suggestions Closes gitlab-org/quality/team-tasks#182 See merge request gitlab-org/gitlab-ce!31213
| * | | | | | | | | Change qa-* class references to js-* for suggestionsTanya Pazitny2019-07-297-11/+11
|/ / / / / / / / /
* | | | | | | | | Merge branch 'tp-qtt182-12' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change qa-* class references to js-* for squash-checkbox Closes gitlab-org/quality/team-tasks#182 See merge request gitlab-org/gitlab-ce!31214
| * | | | | | | | | Change qa-* class references to js-* for squash-checkboxTanya Pazitny2019-07-292-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'tp-qtt182-1' into 'master'Mayra Cabrera2019-07-295-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change qa-reverse-sort class references to rspec-reverse-sort Closes gitlab-org/quality/team-tasks#182 See merge request gitlab-org/gitlab-ce!31202