Commits · 5d5fadb66fcaa1e552be5a9b7abbe9932ebecafa · nexedi / gitlab-ce

05 Feb, 2019 40 commits
- Fix jobs API spec for attachments with UTF-8 filenames · 5d5fadb6
  Sean McGivern authored Feb 05, 2019
  
  5d5fadb6
- Automatic merge of gitlab-org/gitlab-ce master · 8ea0444f
  GitLab Bot authored Feb 05, 2019
  
  8ea0444f
- Merge branch 'mj/security-mr-template' into 'master' · e37abfbb
  Yorick Peterse authored Feb 05, 2019
```
Author is Developer in sec. release MR template

See merge request gitlab-org/gitlab-ce!24934
```
  e37abfbb
- Merge branch 'diff-file-finder' into 'master' · 3bed077c
  Filipa Lacerda authored Feb 05, 2019
```
Added fuzzy file finder to merge requests

Closes #53304

See merge request gitlab-org/gitlab-ce!24434
```
  3bed077c
- Automatic merge of gitlab-org/gitlab-ce master · 2e7f0316
  GitLab Bot authored Feb 05, 2019
  
  2e7f0316
- Merge branch 'jlenny-DocPagesTemplates' into 'master' · d8bbaae6
  Marcia Ramos authored Feb 05, 2019
```
Instructions on how to use Pages templates

Closes #56991

See merge request gitlab-org/gitlab-ce!24796
```
  d8bbaae6
- Instructions on how to use Pages templates · 0f355e57
  Jason Lenny authored Feb 05, 2019
  
  0f355e57
- Update CHANGELOG.md for 11.6.9 · 5376e281
  GitLab Release Tools Bot authored Feb 04, 2019
```
[ci skip]
```
  5376e281
- Update CHANGELOG-EE.md for 11.6.9-ee · 04e52d97
  GitLab Release Tools Bot authored Feb 04, 2019
```
[ci skip]
```
  04e52d97
- Merge branch 'bvl-codeowner-rules-model-ce' into 'master' · d6be539b
  Sean McGivern authored Feb 05, 2019
```
Adds helper for `find_or_create_by` in transaction

See merge request gitlab-org/gitlab-ce!24913
```
  d6be539b
- Merge branch '9282-empty-states-ff' into 'master' · 03b2e55e
  Phil Hughes authored Feb 05, 2019
```
Improves title in FF empty state

Closes #9282

See merge request gitlab-org/gitlab-ee!9425
```
  03b2e55e
- Automatic merge of gitlab-org/gitlab-ce master · 953d3b0b
  GitLab Bot authored Feb 05, 2019
  
  953d3b0b
- Merge branch 'speedup-gitlab-assets-compile' into 'master' · 5dc15b2a
  Sean McGivern authored Feb 05, 2019
```
Cache assets in gitlab:assets:compile

Closes #56691

See merge request gitlab-org/gitlab-ce!24542
```
  5dc15b2a
- Author is Developer in sec. release MR template · eb007f55
  Marin Jankovski authored Feb 05, 2019
  
  eb007f55
- Adds helper for `find_or_create_by` in transaction · ccd8a9b2
  Bob Van Landuyt authored Feb 04, 2019
```
This allows us to call `find_or_create_by` on all models and scopes.
```
  ccd8a9b2
- Automatic merge of gitlab-org/gitlab-ce master · 318b8c99
  GitLab Bot authored Feb 05, 2019
  
  318b8c99
- Merge branch 'sh-encode-content-disposition' into 'master' · f04910f2
  Sean McGivern authored Feb 05, 2019
```
Encode Content-Disposition filenames

Closes #47673

See merge request gitlab-org/gitlab-ce!24919
```
  f04910f2
- Merge branch 'jprovazn-remove-redcarpet' into 'master' · fedecbbe
  Grzegorz Bizon authored Feb 05, 2019
```
Remove Redcarpet markdown engine

Closes #51374

See merge request gitlab-org/gitlab-ce!24819
```
  fedecbbe
- Merge branch 'jprovazn-remove-redcarpet-ee' into 'master' · 77929392
  Grzegorz Bizon authored Feb 05, 2019
```
[EE] Remove Redcarpet markdown engine

See merge request gitlab-org/gitlab-ee!9391
```
  77929392
- [EE] Remove Redcarpet markdown engine · 1a8db125
  Jan Provaznik authored Feb 05, 2019
  
  1a8db125
- Automatic merge of gitlab-org/gitlab-ce master · b97d06b9
  GitLab Bot authored Feb 05, 2019
  
  b97d06b9
- Merge branch '9552-alert-notification-emails-are-not-sent' into 'master' · fc018a62
  Sean McGivern authored Feb 05, 2019
```
Resolve "Alert notification emails are not sent"

See merge request gitlab-org/gitlab-ee!9393
```
  fc018a62
- Merge branch 'issue_7326' into 'master' · 476af7a9
  Sean McGivern authored Feb 05, 2019
```
Epics relantioship API

Closes #7326

See merge request gitlab-org/gitlab-ee!9188
```
  476af7a9
- Epics relantioship API · 97c8886b
  Felipe Artur authored Feb 05, 2019
  
  97c8886b
- Merge branch... · 164f80b9
  Grzegorz Bizon authored Feb 05, 2019
```
Merge branch '9495-geo-make-sure-project-does-not-meet-selective-sync-constraint-before-deleting-it' into 'master'

Geo - Make sure project does not meet selective sync rule before deleting it

Closes #9495

See merge request gitlab-org/gitlab-ee!9345
```
  164f80b9
- Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobs · 6b39f55d
  Rémy Coutable authored Jan 21, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6b39f55d
- Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master' · fb296ab5
  Grzegorz Bizon authored Feb 05, 2019
```
Don't create new pipeline for merge requests with no commits

See merge request gitlab-org/gitlab-ce!24503
```
  fb296ab5
- Add Rails 6 deprecation error message · e6850f73
  Stan Hu authored Feb 05, 2019
  
  e6850f73
- Automatic merge of gitlab-org/gitlab-ce master · 9ed0575a
  GitLab Bot authored Feb 05, 2019
  
  9ed0575a
- Monkey-patch Sprockets to prevent cache ballooning · 31fc5965
  Rémy Coutable authored Jan 30, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  31fc5965
- Merge branch 'fix_jira_integration_VCS1019' into 'master' · 97342325
  Sean McGivern authored Feb 05, 2019
```
Fix comparing equality between `ActionController::Parameters` and a `Hash`....

Closes #57221

See merge request gitlab-org/gitlab-ce!24896
```
  97342325
- Fix comparing equality between `ActionController::Parameters` and a `Hash`.... · 72b59d6e
  Daniel Juarez authored Feb 05, 2019
  
  72b59d6e
- Merge branch 'tc-geo-open-edit-primary-api' into 'master' · 7c7ef7ce
  Sean McGivern authored Feb 05, 2019
```
Make it possible to edit Geo primary through API

Closes #9454

See merge request gitlab-org/gitlab-ee!9328
```
  7c7ef7ce
- Improves title in FF empty state · 12e01aee
  Filipa Lacerda authored Feb 04, 2019
```
The empty state title is based on the
scope selected
```
  12e01aee
- Added fuzzy file finder to merge requests · 6e5461d6
  Phil Hughes authored Jan 16, 2019
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
```
  6e5461d6
- Add a newline after each multiline `expect` · f5f82401
  Peter Leitzen authored Feb 04, 2019
  
  f5f82401
- Permit incoming payload from alertmanager · 7d35ab12
  Peter Leitzen authored Feb 01, 2019
```
This payload needs to be serializable and we are checking its content
in the NotifyService anyway.
```
  7d35ab12
- Clarify example name in alerts controller spec · cf957405
  Peter Leitzen authored Feb 01, 2019
  
  cf957405
- Refactor sending alert emails · b5bbca81
  Peter Leitzen authored Feb 01, 2019
  
  b5bbca81
- Automatic merge of gitlab-org/gitlab-ce master · c95a3cfb
  GitLab Bot authored Feb 05, 2019
  
  c95a3cfb