Commits · 2a634dc0ba307237c88931077bc8429d21e837ad · nexedi / gitlab-ce

23 Jan, 2017 16 commits
- Merge branch 'zj-usage-ping-mattermost' into 'master' · 2a634dc0
  Robert Speicher authored Jan 23, 2017
```
Track Mattermost usage

See merge request !1071
```
  2a634dc0
- Add changelog entry for Mattermost usage ping · af8db537
  Robert Speicher authored Jan 23, 2017
```
[ci skip]
```
  af8db537
- Merge branch 'docs/pages-refactor' into 'master' · dda3aa8c
  Achilleas Pipinellis authored Jan 23, 2017
```
GitLab Pages documentation refactor

Closes #465

See merge request !1072
```
  dda3aa8c
- Split Omnibus and source installation Pages admin docs · 6c2fb7e1
  Achilleas Pipinellis authored Jan 23, 2017
```
[ci skip]
```
  6c2fb7e1
- Bump pages daemon and place Omnibus settings on top · 087bde87
  Achilleas Pipinellis authored Jan 23, 2017
  
  087bde87
- Better highlight prerequisites for Pages · bd8c5e28
  Achilleas Pipinellis authored Jan 23, 2017
  
  bd8c5e28
- Merge multiple notes into one in Pages user docs · 39b9c389
  Achilleas Pipinellis authored Jan 23, 2017
  
  39b9c389
- Fix link to new pages location · dfab0fa0
  Achilleas Pipinellis authored Jan 23, 2017
  
  dfab0fa0
- Bump GitLab version that Pages where ported to CE · f3cac78b
  Achilleas Pipinellis authored Jan 23, 2017
  
  f3cac78b
- Move Pages docs to new location · 695c9273
  Achilleas Pipinellis authored Jan 18, 2017
  
  695c9273
- First iteration on Pages refactoring · 16bb6a74
  Achilleas Pipinellis authored Jan 17, 2017
  
  16bb6a74
- Merge branch 'ce-to-ee' into 'master' · 938624c9
  Dmitriy Zaporozhets authored Jan 23, 2017
```
CE upstream

Closes gitlab-ce#26785

See merge request !1096
```
  938624c9
- Merge branch 'master' into ce-to-ee · caf48647
  Dmitriy Zaporozhets authored Jan 23, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  caf48647
- Track Mattermost usage · ec9c3c5e
  Z.J. van de Weg authored Jan 18, 2017
  
  ec9c3c5e
- Merge branch 'approvals-bug' into 'master' · e965311a
  Jacob Schatz authored Jan 23, 2017
```
Force JSON parsing of approvals API response data.

Closes #1575

See merge request !1095
```
  e965311a
- Force JSON parsing of approvals API response data. · 4e03161c
  Bryce Johnson authored Jan 23, 2017
  
  4e03161c
22 Jan, 2017 24 commits
- Merge branch 'patch-12' into 'master' · 8a6e4152
  Achilleas Pipinellis authored Jan 22, 2017
```
correct the prometheus feature configuration according to https://gitlab.com/git…

See merge request !8703
```
  8a6e4152
- correct the prometheus feature configuration according to... · 184ba52f
  Marcello authored Jan 22, 2017
```
correct the prometheus feature configuration according to https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template#L1147
```
  184ba52f
- Merge branch '26622-fix-transient-failure-in-cycle_analytics_events_spec' into 'master' · 52a7112f
  Robert Speicher authored Jan 22, 2017
```
Make cycle_analytics_events_spec.rb side-effect free

Closes #26622

See merge request !8594
```
  52a7112f
- Merge branch 'mr-widget-fix' into 'master' · 1917ad89
  Jacob Schatz authored Jan 22, 2017
```
Fixed incorrect class names used in merge request widget

See merge request !1093
```
  1917ad89
- Merge branch 'mr-widget-reload-fix' into 'master' · 352ea0ae
  Jacob Schatz authored Jan 22, 2017
```
Merge request widget class names update

See merge request !8700
```
  352ea0ae
- Update VERSION to 8.17.0-pre · 084ac867
  James Lopez authored Jan 22, 2017
  
  084ac867
- Update CHANGELOG.md for 8.16.0 · 64ef0d8c
  James Lopez authored Jan 22, 2017
```
[ci skip]
```
  64ef0d8c
- Fixed incorrect class names used in merge request widget · 5f0aea70
  Phil Hughes authored Jan 22, 2017
  
  5f0aea70
- Merge request widget class names update · 22f69a4f
  Phil Hughes authored Jan 22, 2017
  
  22f69a4f
- Update CHANGELOG.md for 8.16.0 · 182d1525
  James Lopez authored Jan 22, 2017
```
[ci skip]
```
  182d1525
- Update CHANGELOG-EE.md for 8.16.0-ee · 36b89d92
  James Lopez authored Jan 22, 2017
```
[ci skip]
```
  36b89d92
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee · 08dffb5b
  James Lopez authored Jan 22, 2017
  
  08dffb5b
- Merge branch 'mr-widget-replace-body' into 'master' · db930696
  Jacob Schatz authored Jan 22, 2017
```
Replace merge request widget body

See merge request !8697
```
  db930696
- Merge branch 'docs/prometheus' into 'master' · 8ff3db13
  Achilleas Pipinellis authored Jan 22, 2017
```
Add Prometheus docs

See merge request !8699
```
  8ff3db13
- Add information on the dashboard and exporter ports · 43f0fd1f
  Achilleas Pipinellis authored Jan 22, 2017
```
[ci skip]
```
  43f0fd1f
- Merge branch 'merge-dropdown-this-context' into 'master' · 0630f672
  Jacob Schatz authored Jan 22, 2017
```
Fixed bug with merge immediately button not working

See merge request !8696
```
  0630f672
- Expose Prometheus docs to the main README · 73375c18
  Achilleas Pipinellis authored Jan 22, 2017
```
[ci skip]
```
  73375c18
- Add Prometheus docs · 243b18c7
  Achilleas Pipinellis authored Jan 22, 2017
```
Replaces https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1237
Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1227
Omnibus issue: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1481
```
  243b18c7
- Replace merge request widget body · 606147c3
  Phil Hughes authored Jan 22, 2017
  
  606147c3
- Added spec tests · 91608be8
  Phil Hughes authored Jan 22, 2017
  
  91608be8
- Fixed bug with merge immediately button would not work · 1b3b4f4e
  Phil Hughes authored Jan 22, 2017
```
This was caused by using 'this' in a fat arrow function, so 'this' would not equal the jQuery element
```
  1b3b4f4e
- Merge branch 'update-auto-deploy-templates' into 'master' · 125abfd4
  Kamil Trzciński authored Jan 22, 2017
```
Update autodeploy templates [ci skip]

See merge request !8695
```
  125abfd4
- Update autodeploy templates [ci skip] · 5c444aed
  Kamil Trzcinski authored Jan 22, 2017
  
  5c444aed
- Merge branch 'fix-upload-group-avatar' into 'master' · 0363734c
  Stan Hu authored Jan 22, 2017
```
Button by itself will submit forms. Button type button willn't

Closes #26999

See merge request !8694
```
  0363734c