Commits · 22d4a103679c3bfa7a34bdbb9146a1456d5a08c7 · nexedi / gitlab-ce

12 Jan, 2019 8 commits
- Automatic merge of gitlab-org/gitlab-ce master · 22d4a103
  GitLab Bot authored Jan 12, 2019
  
  22d4a103
- Merge branch 'qa-fix-deploy-key-test' into 'master' · 1161c99e
  Lin Jen-Shin authored Jan 12, 2019
```
Fix add_deploy_key_spec.rb

Closes gitlab-org/quality/nightly#29

See merge request gitlab-org/gitlab-ce!24311
```
  1161c99e
- Merge branch 'sh-fix-error-tracking-locale' into 'master' · c6ffe10e
  Stan Hu authored Jan 12, 2019
```
Fix broken master due to locale/gitlab.pot changes

See merge request gitlab-org/gitlab-ee!9136
```
  c6ffe10e
- Fix broken master due to locale/gitlab.pot changes · 64751d0b
  Stan Hu authored Jan 11, 2019
  
  64751d0b
- Automatic merge of gitlab-org/gitlab-ce master · 92e6a367
  GitLab Bot authored Jan 12, 2019
  
  92e6a367
- Merge branch 'danger_commit_message_errors' into 'master' · 5b1baca1
  Robert Speicher authored Jan 12, 2019
```
Fix Danger commit message errors

See merge request gitlab-org/gitlab-ce!24337
```
  5b1baca1
- Automatic merge of gitlab-org/gitlab-ce master · 8b3ef940
  GitLab Bot authored Jan 12, 2019
  
  8b3ef940
- Merge branch 'jivl-update-placeholder-sentry-config' into 'master' · c4798ba6
  Clement Ho authored Jan 12, 2019
```
Update url placeholder for the sentry configuration page

Closes #56276

See merge request gitlab-org/gitlab-ce!24338
```
  c4798ba6
11 Jan, 2019 32 commits
- Update url placeholder for the sentry config · ebf772b4
  Jose Vargas authored Jan 11, 2019
  
  ebf772b4
- Automatic merge of gitlab-org/gitlab-ce master · 635c4940
  GitLab Bot authored Jan 11, 2019
  
  635c4940
- Merge branch... · accf4631
  Mike Greiling authored Jan 11, 2019
```
Merge branch '55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed' into 'master'

Adjust emoji and cancel buttons height in user status modal when emoji is changed

Closes #55884

See merge request gitlab-org/gitlab-ce!24173
```
  accf4631
- Automatic merge of gitlab-org/gitlab-ce master · 283d46fe
  GitLab Bot authored Jan 11, 2019
  
  283d46fe
- Merge branch '37990-task-list-bracket' into 'master' · f5dd9107
  Clement Ho authored Jan 11, 2019
```
Allow brackets in task lists

Closes #56083, #45599, and #37990

See merge request gitlab-org/gitlab-ce!18514
```
  f5dd9107
- Merge branch 'error_tracking_feature_flag_fe' into 'master' · 8a7f40b1
  Clement Ho authored Jan 11, 2019
```
List Sentry Errors in GitLab - Frontend

Closes #55178

See merge request gitlab-org/gitlab-ce!23770
```
  8a7f40b1
- List Sentry Errors in GitLab - Frontend · 5a521254
  Simon Knox authored Jan 11, 2019
  
  5a521254
- Fix Danger commit message errors · efe7f4f7
  Drew Blessing authored Jan 11, 2019
  
  efe7f4f7
- Automatic merge of gitlab-org/gitlab-ce master · c43eb7c0
  GitLab Bot authored Jan 11, 2019
  
  c43eb7c0
- Merge branch 'sec-dev-workflow-rc' into 'master' · 6d6c2e95
  Robert Speicher authored Jan 11, 2019
```
Create an MR for RCs when preparing security MRs

See merge request gitlab-org/gitlab-ce!24319
```
  6d6c2e95
- Create an MR for RCs when preparing security MRs · 5f05ed7f
  Nick Thomas authored Jan 11, 2019
  
  5f05ed7f
- Automatic merge of gitlab-org/gitlab-ce master · 563f9199
  GitLab Bot authored Jan 11, 2019
  
  563f9199
- Merge branch 'sh-fix-import-export-text-page' into 'master' · 962c8e51
  Robert Speicher authored Jan 11, 2019
```
Remove Webhooks from import/export help

See merge request gitlab-org/gitlab-ce!24314
```
  962c8e51
- Add changelog entry · 6ca819ce
  Jared Deckard authored Apr 20, 2018
  
  6ca819ce
- Fix ambiguous brackets in task lists · acac0ecf
  Jared Deckard authored Apr 20, 2018
  
  acac0ecf
- Automatic merge of gitlab-org/gitlab-ce master · 567a76c0
  GitLab Bot authored Jan 11, 2019
  
  567a76c0
- Merge branch 'deprecated-force-reload' into 'master' · a224b760
  Robert Speicher authored Jan 11, 2019
```
Fix deprecation: Passing an argument to force an association to reload is now deprecated

See merge request gitlab-org/gitlab-ce!24136
```
  a224b760
- Automatic merge of gitlab-org/gitlab-ce master · 989333d0
  GitLab Bot authored Jan 11, 2019
  
  989333d0
- Merge branch 'winh-add-list-dropdown-height' into 'master' · 7e8712e2
  Clement Ho authored Jan 11, 2019
```
Adjust height of "Add list" dropdown in issue boards

Closes #56077

See merge request gitlab-org/gitlab-ce!24227
```
  7e8712e2
- Fix deprecation: Passing an argument to force an association to reload is now deprecated · 16c1c0b1
  Jasper Maes authored Jan 03, 2019
  
  16c1c0b1
- Merge branch... · ac5151ac
  Douglas Barbosa Alexandre authored Jan 11, 2019
```
Merge branch '8793-gitlab-returns-500-when-maven-package-metadata-validation-regex-fails' into 'master'

Resolve "GitLab returns 500 when maven package metadata validation regex fails"

Closes #8793

See merge request gitlab-org/gitlab-ee!9125
```
  ac5151ac
- Return 400 error when upload invalid maven package · 42f68eb3
  Dmitriy Zaporozhets authored Jan 10, 2019
```
Right now we return 500 error if user tries to upload maven package with
invalid version. This commit will rescue exception and return 400 error.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  42f68eb3
- Automatic merge of gitlab-org/gitlab-ce master · fa728c49
  GitLab Bot authored Jan 11, 2019
  
  fa728c49
- Merge branch 'docs/uplift-applications-api-doc' into 'master' · fe4f8cad
  Achilleas Pipinellis authored Jan 11, 2019
```
Add more information and refactor format of topic

See merge request gitlab-org/gitlab-ce!24212
```
  fe4f8cad
- Add more information and refactor format of topic · 0661826b
  Evan Read authored Jan 11, 2019
  
  0661826b
- Merge branch 'patch-15' into 'master' · b1f566fb
  Achilleas Pipinellis authored Jan 11, 2019
```
Update github_integration.md to highlight the GitHub OAuth Limitation.

See merge request gitlab-org/gitlab-ee!9124
```
  b1f566fb
- Update github_integration.md to highlight the GitHub OAuth Limitation. · b1c905f0
  Lee Matos authored Jan 11, 2019
  
  b1c905f0
- Automatic merge of gitlab-org/gitlab-ce master · 62be5328
  GitLab Bot authored Jan 11, 2019
  
  62be5328
- Merge branch '9070-refactor-specs' into 'master' · 48597497
  Stan Hu authored Jan 11, 2019
```
Refactor epics/issues API specs

See merge request gitlab-org/gitlab-ce!24302
```
  48597497
- Merge branch '9070-refactor-specs' into 'master' · dc8ce956
  Stan Hu authored Jan 11, 2019
```
Refactor epics/issues API specs

Closes #9070

See merge request gitlab-org/gitlab-ee!9086
```
  dc8ce956
- Merge branch '56172/docs-fix-add-include-to-ci-param-list' into 'master' · 740871ee
  Achilleas Pipinellis authored Jan 11, 2019
```
Update CI YAML parameter table w/ 'include'

Closes #56172

See merge request gitlab-org/gitlab-ce!24309
```
  740871ee
- Merge branch 'danger-shorten-short-commit-warning' into 'master' · 54c10987
  Yorick Peterse authored Jan 11, 2019
```
Shorten danger 50 char commit warning

See merge request gitlab-org/gitlab-ce!24317
```
  54c10987