Commits · 11c454e6c84c14e92668992de1fc30da64b5df9b · nexedi / gitlab-ce

03 Jan, 2017 1 commit

Prevent 500 error when entering/uploading a license · 11c454e6

Drew Blessing authored Dec 29, 2016

Previously, if an admin clicked 'Upload license' without attaching
or entering a license, a 500 error would occur. Now, we check for
the right param. This also changed the render and return to a
redirect, which is more appropriate.

11c454e6

29 Dec, 2016 18 commits
- Merge branch '1418-troubleshooting-guide-for-es' into 'master' · 9e5f3496
  Sean McGivern authored Dec 29, 2016
```
Make ES guide less confusing

Closes #1418

See merge request !992
```
  9e5f3496
- Rework ES documentaton to be less confusing · d3c78b8d
  Valery Sizov authored Dec 29, 2016
  
  d3c78b8d
- Merge branch 'grapify-settings-api' into 'master' · d003966d
  Sean McGivern authored Dec 29, 2016
```
Grapify the settings API

See merge request !1010
```
  d003966d
- Merge branch 'ce_upstream' into 'master' · 8ab250ab
  Valery Sizov authored Dec 29, 2016
```
CE upstream

Closes #1451 and gitlab-ce#25827

See merge request !1000
```
  8ab250ab
- Merge branch 'grapify-push-rules' into 'master' · 7e115252
  Sean McGivern authored Dec 29, 2016
```
Grapify the push rules API

See merge request !1005
```
  7e115252
- Merge branch 'grapify-project-git-hooks' into 'master' · daced567
  Sean McGivern authored Dec 29, 2016
```
Grapify the project git hooks API

See merge request !1006
```
  daced567
- Troubleshooting guide for ES · be705c2d
  Valery Sizov authored Dec 22, 2016
  
  be705c2d
- Merge branch 'grapify-ldap-api' into 'master' · 5a4ea5ee
  Sean McGivern authored Dec 29, 2016
```
Grapify the LDAP API

See merge request !1003
```
  5a4ea5ee
- Merge branch 'grapify-ldap-group-links-api' into 'master' · 09d78a38
  Sean McGivern authored Dec 29, 2016
```
Grapify the LDAP group link API

See merge request !1002
```
  09d78a38
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 80b54eeb
  Valery Sizov authored Dec 29, 2016
  
  80b54eeb
- Merge branch 'view-ce-vs-ee' into 'master' · 0a6e660b
  Sean McGivern authored Dec 29, 2016
```
About GitLab link in sidebar that links to help page

Closes gitlab-ce#24479

See merge request !1008
```
  0a6e660b
- Grapify the LDAP group link API · 16a8b5c6
  Robert Schilling authored Dec 28, 2016
  
  16a8b5c6
- Grapify the LDAP API · 78863f87
  Robert Schilling authored Dec 28, 2016
  
  78863f87
- Grapify the push rules API · 497af21c
  Robert Schilling authored Dec 28, 2016
  
  497af21c
- Grapify the project git hooks API · 65e1a06e
  Robert Schilling authored Dec 28, 2016
  
  65e1a06e
- Merge branch 'grapify-license-api' into 'master' · 01335c14
  Sean McGivern authored Dec 29, 2016
```
Grapify the license API

See merge request !1004
```
  01335c14
- Grapify the settings API · 30df5093
  Robert Schilling authored Dec 29, 2016
  
  30df5093
- Merge branch 'issue_22664-ee' into 'master' · 4901e5c2
  Sean McGivern authored Dec 29, 2016
```
Check if user can read project before being assigned to issue

See merge request !1007
```
  4901e5c2
28 Dec, 2016 7 commits
- About GitLab link in sidebar that links to help page · 450036f5
  victorwu authored Dec 28, 2016
  
  450036f5
- Check if user can read issue before being assigned · 37913698
  Felipe Artur authored Dec 14, 2016
  
  37913698
- Fix issuable assignee update bug when previous assignee is null · 174655c4
  Felipe Artur authored Dec 14, 2016
  
  174655c4
- Fix Project#repository_and_lfs_size after removing repository_size method · 68d6a2a2
  Valery Sizov authored Dec 27, 2016
  
  68d6a2a2
- Update CHANGELOG.md for 8.15.2 · 20be0c01
  Marin Jankovski authored Dec 28, 2016
```
[ci skip]
```
  20be0c01
- Update CHANGELOG-EE.md for 8.15.2-ee · 67e57091
  Marin Jankovski authored Dec 28, 2016
```
[ci skip]
```
  67e57091
- Grapify the license API · 6c32fc56
  Robert Schilling authored Dec 28, 2016
  
  6c32fc56
27 Dec, 2016 14 commits
- Update CHANGELOG.md for 8.15.2 · cf046802
  Robert Speicher authored Dec 27, 2016
```
[ci skip]
```
  cf046802
- Update CHANGELOG-EE.md for 8.15.2-ee · a95500b3
  Robert Speicher authored Dec 27, 2016
```
[ci skip]
```
  a95500b3
- Correct 8.15.0 release date in CHANGELOG-EE.md · 58c8ce82
  Robert Speicher authored Dec 27, 2016
```
[ci skip]
```
  58c8ce82
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream · 832ea8a8
  Valery Sizov authored Dec 27, 2016
  
  832ea8a8
- Merge branch 'changelog-mr8322' into 'master' · 47b35dde
  Yorick Peterse authored Dec 27, 2016
```
Added changelog for MR !8322

See merge request !8325
```
  47b35dde
- Added changelog for MR !8322 · ab30273e
  Yorick Peterse authored Dec 27, 2016
```
[ci skip]
```
  ab30273e
- Merge branch 'zj-disable-timeout-migration' into 'master' · 33e9c9ca
  Yorick Peterse authored Dec 27, 2016
```
Disable timeout while removing services

Closes #25976

See merge request !8322
```
  33e9c9ca
- Link to k8s contributing doc. · 7daa5416
  Sytse Sijbrandij authored Dec 27, 2016
  
  7daa5416
- Merge branch... · 07f0486c
  Douwe Maan authored Dec 27, 2016
```
Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master'

Resolve "Gitlab merge request view crash when commiting a js sourcemap file"

Closes #25931

See merge request !8310
```
  07f0486c
- Merge branch 'filename-to-file-path' into 'master' · 2a830f87
  Sean McGivern authored Dec 27, 2016
```
Rename filename to file path in tooltip of file header in merge request diff

See merge request !8314
```
  2a830f87
- Merge branch 'auto-deploy-with-space' into 'master' · fe600794
  Sean McGivern authored Dec 27, 2016
```
Rename "autodeploy" to "auto deploy"

Closes #25999

See merge request !8289
```
  fe600794
- Merge branch 'fix-build-failure-links' into 'master' · 5db93437
  Sean McGivern authored Dec 27, 2016
```
Fix build failure links in Slack

See merge request !8311
```
  5db93437
- Disable timeout while removing services · 269bc745
  Z.J. van de Weg authored Dec 27, 2016
```
On GitLab.com this migration could take about 3 minutes. Disabling the
statement we know we have enough time to complete this.

Fixes #25976
```
  269bc745
- Add changelog · d56d2a02
  Victor Wu authored Dec 27, 2016
  
  d56d2a02