summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor more common Page Objects to use data tagsqa-selector-uniformization-common-2ddavison2019-07-154-23/+23
| | | | Common usages within GitLab QA include login page, navbars and layouts
* 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
| | |
| * | Always return MR diff_refs if importingGeorge Koltsov2019-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | This change fixes a bug that prevents projects being imported when there are diff notes present in merge requests. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/63955
* | | Merge branch 'fix-comment-race-condition' into 'master'Mike Greiling2019-07-152-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition with polling when saving notes Closes gitlab-ee#12472 See merge request gitlab-org/gitlab-ce!30724
| * | | Fix race condition with polling when saving notesfix-comment-race-conditionHeinrich Lee Yu2019-07-152-2/+7
| | | | | | | | | | | | | | | | | | | | eTagPoll may not be initialized yet when we save a note. Polling is initialized only after discussions are loaded
* | | | Merge branch 'sh-reorder-application-settings' into 'master'Robert Speicher2019-07-151-44/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reorder application settings in db/schema.rb to match EE See merge request gitlab-org/gitlab-ce!30715
| * | | | Reorder application settings in db/schema.rb to match EEsh-reorder-application-settingsStan Hu2019-07-141-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | This makes the CE and EE tables consistent and ensures changes in the schema for the CE version don't cause conflicts with EE.
* | | | | Merge branch '64266-quick-help-hyperlinks' into 'master'Annabel Dunstone Gray2019-07-152-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure quick help links have the same color Closes #64266 See merge request gitlab-org/gitlab-ce!30478
| * | | | | Ensure all quick help links have the same colorPrashanth Chandra2019-07-152-1/+7
|/ / / / /
* | | | | Merge branch 'pl-incident-issue-alert-payload-docs' into 'master'Achilleas Pipinellis2019-07-151-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs on how alert attributes are used See merge request gitlab-org/gitlab-ce!30736
| * | | | | Add docs on how alert attributes are usedPeter Leitzen2019-07-151-1/+11
|/ / / / /
* | | | | Merge branch 'docs/fix-product-tier-badges' into 'master'Marcia Ramos2019-07-156-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Convert more product badges to round brackets See merge request gitlab-org/gitlab-ce!30719
| * | | | | Convert more product badges to round bracketsEvan Read2019-07-156-7/+7
|/ / / / /
* | | | | Merge branch 'add-geo-database-ugprade-docs' into 'master'Achilleas Pipinellis2019-07-151-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add note to GEO documentation about database upgrade See merge request gitlab-org/gitlab-ce!30647
| * | | | | Add note to GEO documentation about database upgradeIan Baum2019-07-151-0/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | * Point to the omnibus documentation for how to upgrade the cluster * Document how to disable the upgrade procedure
* | | | | Merge branch 'caneldem-dependency-scanning-docs' into 'master'Achilleas Pipinellis2019-07-151-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency scanning to add new variable See merge request gitlab-org/gitlab-ce!30528
| * | | | | Update dependency scanning to add new variableCan Eldem2019-07-151-0/+1
|/ / / / /
* | | | | Merge branch 'ce-mw-onboarding-popover-width' into 'master'Tim Zallmann2019-07-151-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (CE Port) Set max width for onboarding popover See merge request gitlab-org/gitlab-ce!30619
| * | | | | (CE Port) Set max width for onboarding popoverMartin Wortschack2019-07-151-0/+1
|/ / / / /
* | | | | Merge branch '63694-tls-opts-for-helm-wait' into 'master'Sean McGivern2019-07-154-23/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab Managed App ensure helm version uses tls opts Closes #63694 See merge request gitlab-org/gitlab-ce!30654
| * | | | | GitLab Managed App ensure helm version uses tls opts63694-tls-opts-for-helm-waitDylan Griffith2019-07-154-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TLS opts were missing from helm version command which meant that it was just perpetually failing and hence wasting 30s of time waiting for a command to be successful that was never going to be successful. This never actually caused any errors because this loop will happily just fail 30 times without breaking the overall script but it was just a waste of installation time so now installing apps should be ~30s faster.
* | | | | | Merge branch 'mh/boards-filter-bar' into 'master'Phil Hughes2019-07-154-29/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display boards filter bar on mobile Closes #45864 See merge request gitlab-org/gitlab-ce!30120
| * | | | | | Display boards filter bar on mobileMartin Hanzel2019-07-154-29/+38
|/ / / / / /
* | | | | | Merge branch 'pages-refactor-ssl-documentation' into 'master'Achilleas Pipinellis2019-07-1529-338/+456
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Pages - refactor "Custom domain / SSL" documentation Closes #47585, #60612, #44606, and #63753 See merge request gitlab-org/gitlab-ce!30363
| * | | | | | Move document to new location, split in 3Marcia Ramos2019-07-1529-338/+456
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Move steps to new doc - Move all concepts to different docs
* | | | | | Merge branch 'rs-namespace-feature' into 'master'Sean McGivern2019-07-151-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Namespace#feature_available no-op Closes #60908 See merge request gitlab-org/gitlab-ce!30641
| * | | | | | Add Namespace#feature_available no-oprs-namespace-featureRobert Speicher2019-07-121-0/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets overridden in `EE::Namespace` and allows us to do things like always treat Epics as "disabled" in Core using the same checks we'd use elsewhere.
* | | | | | Merge branch '64499-add-size-96-to-avatar-sizes-in-avatar-scss' into 'master'Kushal Pandya2019-07-151-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add size 96 to avatar sizes in avatar.scss" Closes #64499 See merge request gitlab-org/gitlab-ce!30671
| * | | | | | Add size 96 to avatar sizes in avatar.scss64499-add-size-96-to-avatar-sizes-in-avatar-scssAmmar Alakkad2019-07-121-0/+5
| | | | | | |
* | | | | | | Merge branch 'docs/gb/serverless-function-dockerfile-runtime' into 'master'Evan Read2019-07-151-13/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about implicit Dockerfile serverless runtime See merge request gitlab-org/gitlab-ce!30672
| * | | | | | | Add a note about implicit Dockerfile serverless runtimeGrzegorz Bizon2019-07-151-13/+22
|/ / / / / / /
* | | | | | | Merge branch 'expand-acronym' into 'master'Achilleas Pipinellis2019-07-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expand (CD) acronym See merge request gitlab-org/gitlab-ce!30646
| * | | | | | | expand (CD) acronymmokha2019-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Do not use acronyms when you can avoid it as you can't assume people > know what you are talking about. Example: instead of MR, write merge > request. - https://about.gitlab.com/handbook/communication/#writing-style-guidelines
View Lorry Controller Status