summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove specs from post-migrate spec fileuse-background-migration-for-self-monitoring-projectrpereira22019-09-091-213/+0
| | | | | | They've been moved to the background migration spec file: spec/lib/gitlab/background_migration/ add_gitlab_instance_administration_project_spec.rb
* Create self-monitoring project in background migrationrpereira22019-09-093-1/+251
| | | | | - A regular migration caused problems such as https://gitlab.com/charts/gitlab/issues/1565.
* Merge branch 'winh-ci-lint-javascript-report' into 'master'Kushal Pandya2019-09-022-21/+1
|\ | | | | | | | | Remove lint:javascript:report job See merge request gitlab-org/gitlab-ce!32462
| * Remove lint:javascript:report jobWinnie Hellmann2019-09-022-21/+1
|/
* Merge branch 'fix-peek-on-puma' into 'master'Rémy Coutable2019-09-0215-52/+54
|\ | | | | | | | | | | | | Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
| * Use gitlab-peek forked gemfix-peek-on-pumaSean McGivern2019-08-282-10/+5
| |
| * Make performance bar enabled checks consistentSean McGivern2019-08-2812-45/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
| * Fix Peek on PumaSean McGivern2019-08-276-11/+24
| | | | | | | | | | | | | | | | | | | | Peek's `Peek.request_id` method doesn't work well with a multi-threaded server and concurrent requests, because requests can 'steal' another request's ID, or unset it before it was due. The upstream change resolves this; the commit here is just to ensure that GitLab works with that upstream change, mostly by not using `Peek.request_id` any more (as the method doesn't exist).
* | Merge branch '50013-add-browser-platform-flags-sign-in-pages' into 'master'Filipa Lacerda2019-09-023-2/+12
|\ \ | | | | | | | | | | | | Add CSS & JS global flags to represent browser and platform on login pages See merge request gitlab-org/gitlab-ce!32521
| * | Add browser and platform flagsKushal Pandya2019-09-023-2/+12
| | | | | | | | | | | | | | | | | | - Adds CSS classes to represent browser & platform - Adds JS flags to `gl` object to represent browser & platform
* | | Merge branch '65304-add-pages-first-deployment-message' into 'master'Filipa Lacerda2019-09-024-1/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve pages load wait time experience" Closes #65304 See merge request gitlab-org/gitlab-ce!32122
| * | | Add warning about Pages initial deployment delay65304-add-pages-first-deployment-messageNathan Friend2019-08-304-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | This commit adds a warning message that is always displayed that informs users that their GitLab Pages sites will take a bit of time before they can be accessed after being deployed for the first time.
* | | | Merge branch 'sh-mermaid-8.2.6' into 'master'Filipa Lacerda2019-09-023-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Mermaid to v8.2.6 See merge request gitlab-org/gitlab-ce!32502
| * | | | Update Mermaid to v8.2.6sh-mermaid-8.2.6Stan Hu2019-09-013-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression where an underscore in labels no longer worked: https://github.com/knsv/mermaid/releases
* | | | | Merge branch 'docs-geo-extra-space' into 'master'Achilleas Pipinellis2019-09-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix space in geo doc See merge request gitlab-org/gitlab-ce!32522
| * | | | | Fix space in geo docMarcel Amirault2019-09-021-1/+1
|/ / / / /
* | | | | Merge branch 'docs/edit-gitlab-pages-domains' into 'master'Achilleas Pipinellis2019-09-021-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify new note for GitLab Pages See merge request gitlab-org/gitlab-ce!32443
| * | | | | Clarify new note for GitLab PagesEvan Read2019-09-021-1/+2
|/ / / / /
* | | | | Merge branch ↵Stan Hu2019-09-021-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '14634-broken-master-ee-spec-services-slash_commands-global_slack_handler_spec-rb-ce' into 'master' Resolve "Broken master: ee/spec/services/slash_commands/global_slack_handler_spec.rb" Closes #14634 See merge request gitlab-org/gitlab-ce!32518
| * | | | | Tidy up conditional messagecharlieablett2019-09-021-5/+7
| | | | | |
| * | | | | Handle projectless `help` commands to chatopscharlieablett2019-09-021-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new if the chatops command is help. - Modify the Gitlab::SlashCommands::Presenters::Help message to skip printing out project information.
* | | | | | Merge branch 'typo-ci-reference' into 'master'Evan Read2019-09-021-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fix typo in GitLab CI configuration reference See merge request gitlab-org/gitlab-ce!32382
| * | | | | Fix typo in GitLab CI configuration referencetgalopin2019-08-291-1/+1
| | | | | |
* | | | | | Merge branch 'fzimmer-master-patch-75127' into 'master'Evan Read2019-09-021-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed Geo general update steps Closes gitlab-ee#12773 See merge request gitlab-org/gitlab-ce!32212
| * | | | | | Changed Geo general update stepsFabian Zimmer2019-09-021-6/+9
|/ / / / / /
* | | | | | Merge branch 'ss/fix-sast-failure-on-master' into 'master'Kushal Pandya2019-09-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add argument to catch See merge request gitlab-org/gitlab-ce!32484
| * | | | | | Add argument to catchss/fix-sast-failure-on-mastersstern2019-08-301-1/+1
| | | | | | |
* | | | | | | Merge branch 'add-overcommit-support' into 'master'Thong Kuah2019-09-023-1/+35
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Adds basic overcommit support See merge request gitlab-org/gitlab-ce!31840
| * | | | | | Adds basic overcommit supportGiorgenes Gelatti2019-09-023-1/+35
|/ / / / / /
* | | | | | Merge branch 'add-warning-note-to-project-container-registry-setting' into ↵Kushal Pandya2019-09-023-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add additional public note to project container registry setting See merge request gitlab-org/gitlab-ce!32447
| * | | | | | Add additional public note to project container registry settingNick Kipling2019-09-023-0/+16
|/ / / / / /
* | | | | | Merge branch 'ee-11670-update-indexer-installation-docs' into 'master'Evan Read2019-09-021-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update elasticsearch indexer installation instructions Closes gitlab-ee#11670 See merge request gitlab-org/gitlab-ce!32274
| * | | | | | Update elasticsearch indexer installation instructionsNick Thomas2019-08-271-4/+5
| | | | | | |
* | | | | | | Merge branch 'docs-fzimmer-geo-upgrade-troubleshooting' into 'master'Evan Read2019-09-021-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cross reference to the troubleshooting guide See merge request gitlab-org/gitlab-ce!32346
| * | | | | | | Added cross reference to the troubleshooting guideFabian Zimmer2019-09-021-0/+2
|/ / / / / / /
* | | | | | | Merge branch 'docs-align-for-single-codebase' into 'master'Evan Read2019-09-023-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Realign 3 docs that diverged between ce/ee See merge request gitlab-org/gitlab-ce!32513
| * | | | | | | Realign 3 docs that diverged between ce/eeMarcel Amirault2019-09-023-8/+8
|/ / / / / / /
* | | | | | | Merge branch 'docs-quick-actions-followup' into 'master'Evan Read2019-09-024-88/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust table entries in quick actions doc Closes #66256 See merge request gitlab-org/gitlab-ce!32038
| * | | | | | | Update quick actions table and combine with epicsMarcel Amirault2019-09-024-88/+65
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Also fix links to renamed headers and moved content
* | | | | | | Merge branch 'docs-shrink-gifs' into 'master'Evan Read2019-09-023-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crop, trim and compress animated gifs See merge request gitlab-org/gitlab-ce!32511
| * | | | | | | Crop, trim and compress animated gifsMarcel Amirault2019-09-023-0/+0
|/ / / / / / /
* | | | | | | Merge branch 'docs/convert-code-quality-gif-to-png' into 'master'Evan Read2019-09-023-3/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert 'code quality' GIF to PNG See merge request gitlab-org/gitlab-ce!32510
| * | | | | | | Convert 'code quality' GIF to PNGRussell Dickenson2019-09-023-3/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Image converted to reduce file size.
* | | | | | | Merge branch 'update-workhorse' into 'master'Ash McKenzie2019-09-022-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v8.10.0 See merge request gitlab-org/gitlab-ce!32501
| * | | | | | | Update GitLab Workhorse to v8.10.0Nick Thomas2019-09-012-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'docs/reduce-code-quality-image-size' into 'master'Evan Read2019-09-021-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced image with smaller version See merge request gitlab-org/gitlab-ce!32509
| * | | | | | | | Replaced image with smaller versionRussell Dickenson2019-09-021-0/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of this image was reduced to: 1. Reduce its storage size. 2. Optimze for faster loading in browser.
* | | | | | | | Merge branch 'pb-update-shell-version-9-4-2' into 'master'Ash McKenzie2019-09-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell to v9.4.2 See merge request gitlab-org/gitlab-ce!32505
| * | | | | | | | Update gitlab-shell to v9.4.2pb-update-shell-version-9-4-2Patrick Bajao2019-09-011-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'sh-fix-ci-lint-500-error' into 'master'Ash McKenzie2019-09-024-1/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error in CI lint when included templates are an array Closes #66605 See merge request gitlab-org/gitlab-ce!32232