Commits · 44af80e2f18f4f138745794103c834e42cc0e36e · nexedi / gitlab-ce

09 Feb, 2017 36 commits
- Fix merge conflicts · 44af80e2
  Nick Thomas authored Feb 09, 2017
  
  44af80e2
- Merge remote-tracking branch 'ce/master' into ce-to-ee · d951d637
  Nick Thomas authored Feb 09, 2017
  
  d951d637
- Merge branch '23173' into 'master' · 091874da
  Rémy Coutable authored Feb 09, 2017
```
Replaced images with the updates UX. Solving #23173

See merge request !8941
```
  091874da
- Merge branch 'patch-13' into 'master' · 412aa85e
  Achilleas Pipinellis authored Feb 09, 2017
```
Update git clone docs

See merge request !8946
```
  412aa85e
- Merge branch 'rc/ce-to-ee-wednesday' into 'master' · 9f182d2c
  Rémy Coutable authored Feb 09, 2017
```
CE Upstream - Wednesday

See merge request !1191
```
  9f182d2c
- Merge branch 'docs/prometheus' into 'master' · 858f3210
  Achilleas Pipinellis authored Feb 09, 2017
```
Update Prometheus documentation

See merge request !1200
```
  858f3210
- Merge branch 'docs/prometheus' into 'master' · 0fddece7
  Achilleas Pipinellis authored Feb 09, 2017
```
Update Prometheus documentation

Closes #27735

See merge request !9060
```
  0fddece7
- Consider existing installations where the setting is not in gitlab.rb · f4ac513b
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  f4ac513b
- Change to direct link for Omnibus Nginx docs · a5dc32e9
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  a5dc32e9
- Add info on changing the default address/port Prometheus listens on · 803cae88
  Achilleas Pipinellis authored Feb 09, 2017
```
Reported in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1905

[ci skip]
```
  803cae88
- Fix GitLab monitor Omnibus setting · a6d39871
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  a6d39871
- Add link to issue where HSTS is discussed · ec77a633
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  ec77a633
- Add changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8764 · b0d8f773
  Achilleas Pipinellis authored Feb 09, 2017
  
  b0d8f773
- Use underscores instead of dashes in gitlab.rb · 06969df9
  Achilleas Pipinellis authored Feb 08, 2017
```
[ci skip]
```
  06969df9
- Add GitLab monitor exporter docs · 05bf2f27
  Achilleas Pipinellis authored Feb 08, 2017
  
  05bf2f27
- Add postgres exporter to Prometheus docs · 78b2530f
  Achilleas Pipinellis authored Feb 08, 2017
  
  78b2530f
- Use localhost for node_exporter · 11747e67
  Achilleas Pipinellis authored Feb 08, 2017
  
  11747e67
- Add Redis exporter to Prometheus docs · 740ed4cf
  Achilleas Pipinellis authored Feb 08, 2017
  
  740ed4cf
- Split node_exporter to its own page · a98bf3e6
  Achilleas Pipinellis authored Feb 08, 2017
  
  a98bf3e6
- Move prometheus docs into their own dir · 30f4763d
  Achilleas Pipinellis authored Feb 08, 2017
```
[ci skip]
```
  30f4763d
- Consider existing installations where the setting is not in gitlab.rb · 6ad99168
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  6ad99168
- Change to direct link for Omnibus Nginx docs · 52313cfb
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  52313cfb
- Add info on changing the default address/port Prometheus listens on · 419bbbf8
  Achilleas Pipinellis authored Feb 09, 2017
```
Reported in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1905

[ci skip]
```
  419bbbf8
- Fix GitLab monitor Omnibus setting · 614f3719
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  614f3719
- Add link to issue where HSTS is discussed · a114f7cb
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  a114f7cb
- Add changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8764 · c803254e
  Achilleas Pipinellis authored Feb 09, 2017
  
  c803254e
- Merge branch 'dz-create-nested-groups-via-ui' into 'master' · 059d1ae4
  Dmitriy Zaporozhets authored Feb 09, 2017
```
Allow creating nested group via UI

See merge request !8786
```
  059d1ae4
- Merge branch 'dz-nested-groups-api' into 'master' · 3d206700
  Dmitriy Zaporozhets authored Feb 09, 2017
```
Nested groups API

See merge request !9034
```
  3d206700
- Merge branch 'docs/omniauth-fix-link' into 'master' · 62870a0e
  Achilleas Pipinellis authored Feb 09, 2017
```
Fix markdown link in Omniauth docs

See merge request !9082
```
  62870a0e
- Fix markdown link in Omniauth docs · 1352a80f
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  1352a80f
- Merge branch 'docs/omniauth-restart' into 'master' · 5849e90d
  Achilleas Pipinellis authored Feb 09, 2017
```
Mention reconfigure/restart in omniauth docs

Closes #27901

See merge request !9081
```
  5849e90d
- Mention reconfigure/restart in omniauth docs · ad85eccc
  Achilleas Pipinellis authored Feb 09, 2017
```
[ci skip]
```
  ad85eccc
- Merge branch 'dm-add-column-with-default-cop' into 'master' · 75244061
  Douwe Maan authored Feb 09, 2017
```
Add cop that checks if add_column_with_default is used with up/down methods

See merge request !9077
```
  75244061
- Migration does not require downtime · 29a32cfc
  Douwe Maan authored Feb 08, 2017
  
  29a32cfc
- Merge branch 'feature-freeze-exceptions' into 'master' · e8f1bfaf
  Robert Speicher authored Feb 09, 2017
```
Describe process around cherry-picking during the feature freeze

See merge request !9075
```
  e8f1bfaf
- Satisfy the new rubocop :) · 63c5b541
  Douwe Maan authored Feb 08, 2017
  
  63c5b541
08 Feb, 2017 4 commits
- Add an ordered list with the 3 people who need to sign off · d3333c34
  Douwe Maan authored Feb 08, 2017
  
  d3333c34
- Merge branch 'remove-jquery-ui-datepicker' into 'master' · 9d62fdfa
  Jacob Schatz authored Feb 08, 2017
```
Removed jQuery UI datepicker

See merge request !8421
```
  9d62fdfa
- Merge branch 'remove-jquery-ui-sortable' into 'master' · 882027bd
  Jacob Schatz authored Feb 08, 2017
```
Removed jQuery UI sortable

See merge request !8478
```
  882027bd
- Rephrase some things · 5d551569
  Douwe Maan authored Feb 08, 2017
  
  5d551569