summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'mc/docs/api-download-latest-artifact-docs' into 'master'Evan Read2019-07-161-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update job artifact download docs See merge request gitlab-org/gitlab-ce!30714
| * | | | | | | | Update job artifact download docsmc/docs/api-download-latest-artifact-docsMatija Čupić2019-07-141-7/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'mc/doc/enforce-template-inclusion-docs' into 'master'Evan Read2019-07-162-0/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create docs for required pipeline config See merge request gitlab-org/gitlab-ce!30660
| * | | | | | | | | Create docs for required pipeline configmc/doc/enforce-template-inclusion-docsScott Hampton2019-07-152-0/+20
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the https://gitlab.com/gitlab-org/gitlab-ee/issues/8429 issue for the required pipeline configuration setting.
* | | | | | | | | Merge branch 'pl-uninstall-button-qa' into 'master'Ramya Authappan2019-07-162-7/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for "Uninstall" button reducing friction See merge request gitlab-org/gitlab-ce!30713
| * | | | | | | | | Check for "Uninstall" button reducing frictionPeter Leitzen2019-07-162-7/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/prom-proj-dashboards' into 'master'Evan Read2019-07-161-46/+71
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the Prometheus custom dashboards docs See merge request gitlab-org/gitlab-ce!30582
| * | | | | | | | | Clean up the Prometheus custom dashboards docsAchilleas Pipinellis2019-07-161-46/+71
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Place all under one section - Fix Markdown
* | | | | | | | | Merge branch ↵Evan Read2019-07-161-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/12733-docs-using-multiple-extends-in-gitlab-ci-yml-introduced-in-gitlab-12' into 'master' Specify what version of multiple extends in docs Closes gitlab-ee#12733 See merge request gitlab-org/gitlab-ce!30667
| * | | | | | | | | Specify what version of multiple extends in docsdocs/12733-docs-using-multiple-extends-in-gitlab-ci-yml-introduced-in-gitlab-12Steve Azzopardi2019-07-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first MVC of `extends` did not support a job having multiple extends, this was added in GitLab 12.0. closes https://gitlab.com/gitlab-org/gitlab-ee/issues/12733
* | | | | | | | | | Merge branch 'docs/ssot-admin-ha' into 'master'Mike Lewis2019-07-1613-7/+115
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT for administration/high_availability docs Closes #64560 See merge request gitlab-org/gitlab-ce!30729
| * | | | | | | | | | SSoT for administration/high_availability docsAchilleas Pipinellis2019-07-1613-7/+115
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure we have type defined in the frontmatter - Add troubleshooting sections where absent - Meaningful intros where absent
* | | | | | | | | | Merge branch 'docs/ssot-admin-auth' into 'master'Mike Lewis2019-07-1612-38/+161
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT for administration/auth docs Closes #64559 See merge request gitlab-org/gitlab-ce!30727
| * | | | | | | | | | SSoT for administration/auth docsAchilleas Pipinellis2019-07-1612-38/+161
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure we have type defined in the frontmatter - Add troubleshooting sections where absent - Meaningful intros where absent
* | | | | | | | | | Merge branch 'docs/quick_actions' into 'master'Evan Read2019-07-161-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39964 Closes #39964 See merge request gitlab-org/gitlab-ce!30722
| * | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39964Russell Dickenson2019-07-161-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-broken-vue-i18n-strings' into 'master'Kushal Pandya2019-07-164-12/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken vue i18n strings See merge request gitlab-org/gitlab-ce!30753
| * | | | | | | | | | Fix broken vue i18n stringsAndré Luís2019-07-164-12/+39
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-sign-up-restrictions' into 'master'Evan Read2019-07-161-9/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add more detail to sign-up restrictions See merge request gitlab-org/gitlab-ce!30580
| * | | | | | | | | | Docs: Add more detail to sign-up restrictionsTristan Williams2019-07-161-9/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'mjrider-master-patch-10559' into 'master'Evan Read2019-07-161-0/+69
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document openstack object store configuration See merge request gitlab-org/gitlab-ce!30659
| * | | | | | | | | | Document openstack object store configurationRobbert Müller2019-07-161-0/+69
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Liek asked in gitlab-org/gitlab-ce#59501
* | | | | | | | | | Merge branch 'patch-72' into 'master'Ray Paik2019-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update markdown.md to remove typo, "test" was left in the documentation See merge request gitlab-org/gitlab-ce!30752
| * | | | | | | | | | Update markdown.md to remove typo, "test" was left in the documentationChristopher Amurao2019-07-151-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Mike Greiling2019-07-156-19/+61
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64249-align-container-registry-empty-state-with-design-guidelines' into 'master' Align container registry empty state with design guidelines Closes #64249 See merge request gitlab-org/gitlab-ce!30502
| * | | | | | | | | | Updating wording as per desgn guidelinesNick Kipling2019-07-156-19/+61
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shortened descriptive text Added copy button to code snippets
* | | | | | | | | | Merge branch 'winh-move-setCurrentBoard' into 'master'Fatih Acet2019-07-152-0/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move setCurrentBoard() from BoardsStoreEE to core (CE-backport) See merge request gitlab-org/gitlab-ce!30626
| * | | | | | | | | | Add setCurrentBoard to boardsStoreWinnie Hellmann2019-07-152-0/+17
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9cd745c65bcb51d615399e82d8b26ef5cce972e1)
* | | | | | | | | | Merge branch 'qa-dc-unquarantine-add-deploy-key-test' into 'master'59325-units-are-not-shown-on-the-performance-dashboard-3Mark Lapierre2019-07-151-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unquarantine Add Deploy Key test See merge request gitlab-org/gitlab-ce!30756
| * | | | | | | | | | Unquarantine Add Deploy Key testDesiree Chevalier2019-07-151-2/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs-qa-style_guide-example-fix' into 'master'Dan Davison2019-07-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an appropriate solution in QA E2E style guide example See merge request gitlab-org/gitlab-ce!30761
| * | | | | | | | | | Add an appropriate solution in documentationddavison2019-07-151-0/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A "bad" example was given, however no solution was provided for fixing the bad example
* | | | | | | | | | Merge branch '64407-vfazio-quirk-omniauth-strategies-openidconnect' into ↵Stan Hu2019-07-154-3/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Convert client_auth_method to a Symbol for quirked OmniAuth providers Closes #64407 See merge request gitlab-org/gitlab-ce!30683
| * | | | | | | | | | Add changelog entryVincent Fazio2019-07-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
| * | | | | | | | | | Add client_auth_method test cases for OIDCVincent Fazio2019-07-151-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
| * | | | | | | | | | Update OIDC troubleshooting languageVincent Fazio2019-07-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
| * | | | | | | | | | Update OpenID Connect documentationVincent Fazio2019-07-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List the supported values for client_auth_method Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
| * | | | | | | | | | Symbolize client_auth_method for quirked providersVincent Fazio2019-07-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Providers such as OpenIDConnect ultimately leverage the rack-oauth2 gem which requires the client_auth_method value to be defined as a symbol in order to correctly select the authorization method used. Derivative providers that specify OmniAuth::Strategies::OpenIDConnect as their strategy_class will also convert this value to a symbol. Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
* | | | | | | | | | | Merge branch 'sh-fix-httpclient-ssl' into 'master'Mayra Cabrera2019-07-152-0/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make httpclient respect system SSL configuration Closes charts/gitlab#1436 See merge request gitlab-org/gitlab-ce!30749
| * | | | | | | | | | | Make httpclient respect system SSL configurationsh-fix-httpclient-sslStan Hu2019-07-152-0/+23
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, httpclient (and hence anything that uses rack-oauth2) ignores the system-wide SSL certificate configuration in favor of its own `cacert.pem`. This makes it impossible to use custom certificates without patching that file. Until https://github.com/nahi/httpclient/pull/386 is merged, we work around this limitation by forcing the `HTTPClient` SSL store to use the default system configuration. Closes https://gitlab.com/charts/gitlab/issues/1436
* | | | | | | | | | | Merge branch '57538-normalize-users-private-profile-field' into 'master'Mayra Cabrera2019-07-1510-6/+111
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate null values for users.private_profile column See merge request gitlab-org/gitlab-ce!29888
| * | | | | | | | | | | Migrate null values for users.private_profileAdam Hegyi2019-07-1510-6/+111
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Background migration for changing null values to false - Set false as default value for private_profile DB column
* | | | | | | | | | | Merge branch 'sh-reorder-boards-schema-db' into 'master'osw-multi-assignee-api-testRobert Speicher2019-07-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder fields in boards schema to match EE See merge request gitlab-org/gitlab-ce!30751
| * | | | | | | | | | | Reorder fields in boards schema to match EEsh-reorder-boards-schema-dbStan Hu2019-07-151-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates conflicts between CE and EE db/schema.rb files.
* | | | | | | | | | | Merge branch 'hide-restricted-visibility-radio' into 'master'Douglas Barbosa Alexandre2019-07-156-255/+309
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide restricted and disallowed visibility radios See merge request gitlab-org/gitlab-ce!30590
| * | | | | | | | | | Hide restricted and disallowed visibility radioshide-restricted-visibility-radioLuke Bennett2019-07-156-255/+309
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show a message if many levels are restricted and a different message if all levels are restricted.
* | | | | | | | | | Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' ↵Robert Speicher2019-07-155-11/+35
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Always return MR diff_refs if importing See merge request gitlab-org/gitlab-ce!30630
| * | | | | | | | | | Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deletedGeorge Koltsov2019-07-155-10/+16
| | | | | | | | | | |
| * | | | | | | | | | Add changelog entryGeorge Koltsov2019-07-111-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Add MergeRequest#diff_refs specGeorge Koltsov2019-07-111-6/+17
| | | | | | | | | | |