summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable PumaWorkerKiller when testing workerspuma-mem-counterJan Provaznik2019-06-072-2/+1
| | | | | | | | Specs in `spec/rack_servers/puma_spec.rb` test spawning/signalling of Puma workers - we don't need PumaWorkerKiller in this case. Also during the test we load only a basic rack application, and the observer depends on Gitlab::Metrics -> we would have to load many dependencies to make these available (or mock this class).
* Add metric for measuring PumaWorkerKiller activityJan Provaznik2019-06-074-0/+55
| | | | | | PumaWorkerKiller is used for periodically checking and killing workers (the biggest one) if overall memory reaches specified limit. This metric allows us to watch number of killed workers.
* Merge branch '62091-remove-time-windows-flag' into 'master'Nick Thomas2019-06-077-62/+10
|\ | | | | | | | | | | | | Remove metrics_time_window feature flag Closes #62091 See merge request gitlab-org/gitlab-ce!28670
| * Remove metrics_time_window feature flagSarah Yasonik2019-06-077-62/+10
|/
* Merge branch 'docs/ssot-some-ci-section' into 'master'Achilleas Pipinellis2019-06-0712-118/+285
|\ | | | | | | | | | | | | SSoT audit fixes for some topics in CI section Closes #61505 See merge request gitlab-org/gitlab-ce!28957
| * SSoT audit fixesEvan Read2019-06-0712-118/+285
|/ | | | | Implements part of the single source of truth audit fixes for the CI section.
* Merge branch 'docs/edit-click-through' into 'master'Achilleas Pipinellis2019-06-071-4/+4
|\ | | | | | | | | Integrate demo link into content more See merge request gitlab-org/gitlab-ce!29242
| * Integrate demo link into content moreEvan Read2019-06-071-4/+4
|/
* Merge branch 'ce-mw-onboarding-tour-helper' into 'master'Phil Hughes2019-06-074-0/+79
|\ | | | | | | | | (CE Port) Onboarding helper component See merge request gitlab-org/gitlab-ce!29133
| * Add styles and animations for onboarding helperMartin Wortschack2019-06-074-0/+79
|/ | | | | - Add styles for popover - Add $accepting-mr-label-color to color variables
* Merge branch 'update_source_#62187' into 'master'Achilleas Pipinellis2019-06-072-11/+51
|\ | | | | | | | | Add git 2.21 install from update_source See merge request gitlab-org/gitlab-ce!28836
| * Add git 2.21 install from update_sourceÆx2019-06-072-11/+51
|/
* Merge branch '9764-operations-icon-is-shown-twice-on-small-viewport' into ↵Kushal Pandya2019-06-071-16/+16
|\ | | | | | | | | | | | | 'master' Hide operations icon in small screens See merge request gitlab-org/gitlab-ce!29230
| * Hide operations icon in small screens9764-operations-icon-is-shown-twice-on-small-viewportDhiraj Bodicherla2019-06-061-16/+16
| | | | | | | | | | | | | | | | | | In small screens operations icon is visible and also present in More menu. This commit cleans up the More menu for small screens and also shows and hides nav links appropriately based on screen sizes Cleaned up title attrs in dashboard
* | Merge branch 'docs/58975-jira-integration-docs' into 'master'Mike Lewis2019-06-078-22/+27
|\ \ | | | | | | | | | | | | | | | | | | Improve Jira Server documentation Closes #58975 See merge request gitlab-org/gitlab-ce!28463
| * | Apply reviewer feedbackdocs/58975-jira-integration-docsMike Lewis2019-06-072-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove image for adding new permission scheme - Delete jira_add_permission_scheme.png as no longer included in content - add group language - Reword the add user to group instructions - Reword the add selected users instruction - Reword add permission scheme instruction - Update jira_server_configuration intro
| * | Change text to match screencapscharlieablett2019-06-071-2/+2
| | |
| * | Reword for claritycharlieablett2019-06-071-2/+2
| | |
| * | Upgrade jira user permissions workflow docscharlieablett2019-06-078-14/+24
| | | | | | | | | | | | | | | Update screecaps to reflect jira version ~8.1 and update instructions to include Permission Schemes.
| * | Fix some typoescharlieablett2019-06-071-2/+2
| | |
* | | Merge branch 'sh-improve-openid-docs' into 'master'Evan Read2019-06-071-0/+35
|\ \ \ | | | | | | | | | | | | | | | | Fix OpenID Connect documentation See merge request gitlab-org/gitlab-ce!29314
| * | | Fix OpenID Connect documentationsh-improve-openid-docsStan Hu2019-06-061-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users were unable to get logins working with OpenID Connect because of a missing `name` argument in the configuration. This resulted in 404s immediately after attempting to login. This describes the workaround mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/62208#note_178774809. This also adds an example profile for using Google.
* | | | Merge branch 'sh-fix-openid-connect-defaults' into 'master'Ash McKenzie2019-06-073-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make OpenID Connect work without requiring a name Closes #62208 See merge request gitlab-org/gitlab-ce!29312
| * | | | Make OpenID Connect work without requiring a namesh-fix-openid-connect-defaultsStan Hu2019-06-063-0/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no name argument given, OmniAuth will try to guess the name by the class name. In https://github.com/omniauth/omniauth/blob/v1.9.0/lib/omniauth/strategy.rb#L139, `OmniAuth::Strategies::OpenIDConnect` gets translated to `openidconnect`. This leads to an immediate 404 error after clicking the login button because OmniAuth can't match the current route (/users/auth/openid_connect) against the expected one (/users/auth/openidconnect). Other providers, such as Google OAuth2, set this name as the default option within the OmniAuth Strategy. Until a fix is merged upstream, let's just set the parameter ourselves. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62208
* | | | Merge branch 'docs/add-chatops-request-doc' into 'master'Evan Read2019-06-075-4/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs - add section to dev docs on accessing chatops Closes #62127 See merge request gitlab-org/gitlab-ce!28623
| * | | | Add section to dev docs on accessing chatopsLucas Charles2019-06-075-4/+32
|/ / / / | | | | | | | | | | | | closes 62127
* | | | Merge branch 'docs/realign-ce-docs' into 'master'Evan Read2019-06-071-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port missing docs to CE See merge request gitlab-org/gitlab-ce!29279
| * | | | Port missing docs to CEdocs/realign-ce-docsAchilleas Pipinellis2019-06-061-5/+3
| | | | |
* | | | | Merge branch 'docs/add-ci-breaking-changes' into 'master'Evan Read2019-06-071-0/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs for breaking changes of GitLab CI in 12.0 See merge request gitlab-org/gitlab-ce!29053
| * | | | | Add docs for breaking changes of GitLab CI in 12.0docs/add-ci-breaking-changesSteve Azzopardi2019-06-061-0/+27
| | | | | |
* | | | | | Merge branch 'qa-ml-visit-after-wait-for-push' into 'master'Mark Lapierre2019-06-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visit project after push Closes gitlab-org/quality/nightly#105 See merge request gitlab-org/gitlab-ce!29247
| * | | | | | Visit project after pushqa-ml-visit-after-wait-for-pushMark Lapierre2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Waits for the push to a project before visiting the page so that the updated state is shown when the page loads
* | | | | | | Merge branch 'remove-dup-shared-context-folder' into 'master'Robert Speicher2019-06-061-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes duplicated shared_context folder on spec/support See merge request gitlab-org/gitlab-ce!29305
| * | | | | | | Removes duplicated shared_context folderremove-dup-shared-context-folderMayra Cabrera2019-06-061-0/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the shared context are located under spec/support/shared_contexts, we only have one file under spec/support/shared_context, this MR moves it to spec/support/shared_contexts instead
* | | | | | | Merge branch '60303-replace-sidekiq-mtail-metrics' into 'master'Robert Speicher2019-06-063-7/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds sidekiq worker label for ruby metrics Closes #60303 See merge request gitlab-org/gitlab-ce!29215
| * | | | | | Add changelog entry for sidekiq metricsrc/test_rebase60303-replace-sidekiq-mtail-metricsRyan Cobb2019-06-061-0/+5
| | | | | | |
| * | | | | | Adds sidekiq worker label for ruby metricsRyan Cobb2019-06-062-7/+1
| | | | | | |
* | | | | | | Merge branch 'ce-5456-add-cluster-health-alert-frontend' into 'master'Mike Greiling2019-06-062-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Add frontend support for cluster health alerts See merge request gitlab-org/gitlab-ce!29075
| * | | | | | | Add frontend support for cluster health alertsAdriel Santiago2019-06-062-0/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Adds a new query text input for metric alerts
* | | | | | | Merge branch '59232-add-storage-counter-ce' into 'master'Phil Hughes2019-06-063-1/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for Storage Counter changes Closes #59232 See merge request gitlab-org/gitlab-ce!29206
| * | | | | | | Adds hashed option to bs linked options59232-add-storage-counter-ceFilipa Lacerda2019-06-053-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds isOdd function
* | | | | | | | Merge branch 'dont-fail-danger-with-emojis' into 'master'62884-the-next-kn-service-deployed-don-t-get-fetched-due-to-reactivecachingRobert Speicher2019-06-061-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Don't fail the pipeline when a colon-emoji is used See merge request gitlab-org/gitlab-ce!29291
| * | | | | | | Don't fail the pipeline when a colon-emoji is usedSean McGivern2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A colon-emoji like :100: can be valid in the case where we're talking about the GitLab feature that processes these into emojis. It's fine to warn about those, but failing the pipeline is too restrictive.
* | | | | | | | Merge branch 'pages-domains-validity-time-mysql' into 'master'Nick Thomas2019-06-068-2/+163
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add certificate valid time to pages domain table See merge request gitlab-org/gitlab-ce!29287
| * | | | | | | | Add certificate valid time to pages domain tableVladimir Shushlin2019-06-068-2/+163
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* | | | | | | | Merge branch 'pages_lets_encrypt_orders' into 'master'Nick Thomas2019-06-0618-35/+552
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pages domains acme orders See merge request gitlab-org/gitlab-ce!27811
| * | | | | | | | Add pages domains acme ordersVladimir Shushlin2019-06-0618-35/+552
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract acme double to helper Create ACME challanges for pages domains * Create order & challange through API * save them to database * request challenge validation We're saving order and challenge as one entity, that wouldn't be correct if we would order certificates for several domains simultaneously, but we always order certificate per domain Add controller for processing acme challenges redirected from pages Don't save acme challenge url - we don't use it Validate acme challenge attributes Encrypt private_key in acme orders
* | | | | | | | Merge branch 'docs-qa-dynamic-element-validation' into 'master'Dan Davison2019-06-062-3/+149
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Documentation for dynamic element validation See merge request gitlab-org/gitlab-ce!29169
| * | | | | | | Documentation for dynamic element validationdocs-qa-dynamic-element-validationddavison2019-06-052-3/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration on the documentation for how dynamic element validation works within the GitLab QA framework and how to utilize it
* | | | | | | | Merge branch 'master' into 'master'Stan Hu2019-06-063-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some typos See merge request gitlab-org/gitlab-ce!29286