Commits · 61557a1113f6b67b7899970a4377ebfc2808af1b · nexedi / gitlab-ce

11 Feb, 2019 29 commits
- Automatic merge of gitlab-org/gitlab-ce master · 61557a11
  GitLab Bot authored Feb 11, 2019
  
  61557a11
- Merge branch 'fix_deployment_service_predefined_variables' into 'master' · ef875bd7
  Nick Thomas authored Feb 11, 2019
```
Add missing argument to DeploymentService#predefined_variables

See merge request gitlab-org/gitlab-ce!24989
```
  ef875bd7
- Automatic merge of gitlab-org/gitlab-ce master · a67a4acb
  GitLab Bot authored Feb 11, 2019
  
  a67a4acb
- Merge branch 'deprecated-migration-inheritance' into 'master' · 1569389f
  Rémy Coutable authored Feb 11, 2019
```
Directly inheriting from ActiveRecord::Migration is deprecated

See merge request gitlab-org/gitlab-ce!25066
```
  1569389f
- Merge branch 'deprecated-spec-positional-args' into 'master' · e7a13926
  Rémy Coutable authored Feb 11, 2019
```
Using positional arguments in request specs have been deprecated

See merge request gitlab-org/gitlab-ee!9506
```
  e7a13926
- Automatic merge of gitlab-org/gitlab-ce master · 623affa2
  GitLab Bot authored Feb 11, 2019
  
  623affa2
- Merge branch 'patch-22' into 'master' · e927833b
  Rémy Coutable authored Feb 11, 2019
```
use timeout as it appears in logs

See merge request gitlab-org/gitlab-ce!21264
```
  e927833b
- use timeout as it appears in logs · 3a836687
  Ben Bodenmiller authored Feb 11, 2019
  
  3a836687
- Automatic merge of gitlab-org/gitlab-ce master · bfcd3f6d
  GitLab Bot authored Feb 11, 2019
  
  bfcd3f6d
- Merge branch '55447-validate-k8s-ca-cert' into 'master' · 15af0a45
  Dmitriy Zaporozhets authored Feb 11, 2019
```
Validate k8s CA certificate at cluster creation

See merge request gitlab-org/gitlab-ce!24990
```
  15af0a45
- Automatic merge of gitlab-org/gitlab-ce master · 0ab64c0d
  GitLab Bot authored Feb 11, 2019
  
  0ab64c0d
- Merge branch '57431-sprockets-caches-files-independent-of-content' into 'master' · 8886924c
  Lin Jen-Shin authored Feb 11, 2019
```
Use correct integrity hash for sprockets caching

Closes #57431

See merge request gitlab-org/gitlab-ce!25033
```
  8886924c
- Automatic merge of gitlab-org/gitlab-ce master · 62e746b8
  GitLab Bot authored Feb 11, 2019
  
  62e746b8
- Merge branch 'qa-improve-wait-for-push' into 'master' · 36579a0e
  Ramya Authappan authored Feb 11, 2019
```
[EE] Remove wait_for_push from EE E2E test

See merge request gitlab-org/gitlab-ee!8986
```
  36579a0e
- [EE] Remove wait_for_push from EE E2E test · 1eb09a88
  Mark Lapierre authored Feb 11, 2019
  
  1eb09a88
- Merge branch 'qa-improve-wait-for-push' into 'master' · 1a1f28fe
  Ramya Authappan authored Feb 11, 2019
```
[CE] Improve `wait_for_push`

Closes #53308

See merge request gitlab-org/gitlab-ce!24085
```
  1a1f28fe
- [CE] Improve `wait_for_push` · 97265d39
  Mark Lapierre authored Feb 11, 2019
  
  97265d39
- Automatic merge of gitlab-org/gitlab-ce master · c9d5c8fe
  GitLab Bot authored Feb 11, 2019
  
  c9d5c8fe
- Merge branch 'an-peek-jaeger' into 'master' · 25af9032
  Grzegorz Bizon authored Feb 11, 2019
```
Provide a performance bar link to the Jaeger UI

See merge request gitlab-org/gitlab-ce!24902
```
  25af9032
- Merge branch 'i18n-externalize-date-picker-string' into 'master' · c71c50e4
  Phil Hughes authored Feb 11, 2019
```
Externalize date picker string

See merge request gitlab-org/gitlab-ce!25068
```
  c71c50e4
- Merge branch 'sh-geo-fdw-troubleshooting-docs' into 'master' · 38950881
  Evan Read authored Feb 11, 2019
```
Document troubleshooting steps for Geo and FDW

See merge request gitlab-org/gitlab-ee!9504
```
  38950881
- Automatic merge of gitlab-org/gitlab-ce master · 7d4f5fe9
  GitLab Bot authored Feb 11, 2019
  
  7d4f5fe9
- Merge branch 'docs-correct-word' into 'master' · 91b88e0b
  Evan Read authored Feb 11, 2019
```
Docs: correct word

See merge request gitlab-org/gitlab-ce!25065
```
  91b88e0b
- Document troubleshooting steps for Geo and FDW · 7ffc97ed
  Stan Hu authored Feb 08, 2019
```
Hopefully this makes it clearer how to diagnose and fix issues
getting Geo and PostgreSQL FDW working.
```
  7ffc97ed
- Automatic merge of gitlab-org/gitlab-ce master · c7461be9
  GitLab Bot authored Feb 11, 2019
  
  c7461be9
- Merge branch 'qa-staging-32-fix-create-project-spec' into 'master' · a14be36a
  Ramya Authappan authored Feb 11, 2019
```
Fix create_project_spec

Closes gitlab-org/quality/staging#32

See merge request gitlab-org/gitlab-ce!25029
```
  a14be36a
- Merge branch 'reset-settings-column-info' into 'master' · 6d6a07ce
  Stan Hu authored Feb 11, 2019
```
Reload ApplicationSetting column information before use

See merge request gitlab-org/gitlab-ee!9501
```
  6d6a07ce
- Automatic merge of gitlab-org/gitlab-ce master · cbe25d50
  GitLab Bot authored Feb 11, 2019
  
  cbe25d50
- Merge branch 'removes-milestone-from-cluster-base-domain-docs' into 'master' · 84c9b1e7
  Evan Read authored Feb 11, 2019
```
Removes milestone from cluster base domain documentation

See merge request gitlab-org/gitlab-ce!25045
```
  84c9b1e7
10 Feb, 2019 4 commits
- Automatic merge of gitlab-org/gitlab-ce master · 86c8231b
  GitLab Bot authored Feb 10, 2019
  
  86c8231b
- Merge branch 'pl-copy-still-active' into 'master' · 0841f052
  Stan Hu authored Feb 10, 2019
```
Fix error when reloading code in Sidekiq

Closes #54320

See merge request gitlab-org/gitlab-ce!25069
```
  0841f052
- Fix error when reloading code in Sidekiq · 1931c3ef
  Peter Leitzen authored Feb 10, 2019
```
This commit fixes the following error in development:

    ArgumentError: A copy of Gitlab::Metrics::Transaction has been
    removed from the module tree but is still active!
```
  1931c3ef
- Externalize date picker string · 294a2a70
  Katrin Leinweber authored Feb 10, 2019
  
  294a2a70
09 Feb, 2019 3 commits
- Directly inheriting from ActiveRecord::Migration is deprecated · 3820eca5
  Jasper Maes authored Feb 09, 2019
  
  3820eca5
- Using positional arguments in request specs have been deprecated · f64ba502
  Jasper Maes authored Feb 09, 2019
  
  f64ba502
- Docs: correct word · 4d4af21a
  Merve authored Feb 09, 2019
  
  4d4af21a
08 Feb, 2019 4 commits
- Automatic merge of gitlab-org/gitlab-ce master · 544397b8
  GitLab Bot authored Feb 08, 2019
  
  544397b8
- Merge branch 'qa-quarantine-saml-test' into 'master' · 9fb3c7d5
  Sanad Liaquat authored Feb 08, 2019
```
Quarantine failing test

See merge request gitlab-org/gitlab-ee!9503
```
  9fb3c7d5
- Merge branch '57428-actionview-template-error-undefined-method-for-nil-nilclass' into 'master' · 5b23f2b0
  Phil Hughes authored Feb 08, 2019
```
Resolve "ActionView::Template::Error: undefined method `>' for nil:NilClass"

Closes #57428

See merge request gitlab-org/gitlab-ce!25028
```
  5b23f2b0
- Improved readability of issues related MR status spec · 20ce370f
  Constance Okoghenun authored Feb 08, 2019
  
  20ce370f