Commits · cde1181df4e978ca99f87e4cc87664ffd362584d · nexedi / gitlab-ce

03 Sep, 2018 40 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-03 · cde1181d
  GitLab Bot authored Sep 03, 2018
```
# Conflicts:
#	doc/api/settings.md
#	lib/gitlab/email/handler.rb
#	locale/gitlab.pot

[ci skip]
```
  cde1181d
- Merge branch 'ce-to-ee-2018-09-03' into 'master' · 9cda7958
  Sean McGivern authored Sep 03, 2018
```
CE upstream - 2018-09-03 12:23 UTC

Closes #2635

See merge request gitlab-org/gitlab-ee!7210
```
  9cda7958
- Merge branch 'dz-fix-maven-omnibus' into 'master' · fdd10597
  Achilleas Pipinellis authored Sep 03, 2018
```
Add omnibus instractions for packages feature

See merge request gitlab-org/gitlab-ee!7212
```
  fdd10597
- Merge branch 'Ravlen-Repos/gitlab-ee-ee-ce-application-settings-docs' into 'master' · 48541cac
  Rémy Coutable authored Sep 03, 2018
```
Cleanup of api settings.md doc

See merge request gitlab-org/gitlab-ce!21474
```
  48541cac
- Merge branch 'Ravlen-Repos/gitlab-ee-ee-ce-application-settings-docs' into 'master' · bb7ff51c
  Rémy Coutable authored Sep 03, 2018
```
Cleanup of (EE) api settings.md doc

See merge request gitlab-org/gitlab-ee!7208
```
  bb7ff51c
- Merge branch 'winh-move-badge-settings' into 'master' · a4fc370c
  Phil Hughes authored Sep 03, 2018
```
Move badge settings to general settings

Closes #46590

See merge request gitlab-org/gitlab-ce!21333
```
  a4fc370c
- Move badge settings to general settings · 743add97
  Winnie Hellmann authored Sep 03, 2018
  
  743add97
- Add omnibus instractions for packages feature · e25b1446
  Dmitriy Zaporozhets authored Sep 03, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e25b1446
- Merge branch '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handler-rb' into 'master' · c0625e5d
  Douwe Maan authored Sep 03, 2018
```
Extract EE-specific lines from Gitlab::Email::Handler

See merge request gitlab-org/gitlab-ce!21358
```
  c0625e5d
- Merge branch '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handler-rb' into 'master' · 651f923d
  Douwe Maan authored Sep 03, 2018
```
Resolve "Extract EE specific files/lines for lib/gitlab/email/handler.rb"

Closes #6417

See merge request gitlab-org/gitlab-ee!6975
```
  651f923d
- Merge branch 'sh-improve-bitbucket-server-logging' into 'master' · 3b7647b0
  Rémy Coutable authored Sep 03, 2018
```
Add JSON logging for Bitbucket Server importer

See merge request gitlab-org/gitlab-ce!21378
```
  3b7647b0
- Resolve doc/update/README.md · 8f498bea
  Sean McGivern authored Sep 03, 2018
  
  8f498bea
- Resolve config/initializers/1_settings.rb · 32ffea69
  Sean McGivern authored Sep 03, 2018
  
  32ffea69
- Resolve app/views/groups/labels/index.html.haml · 5083bb09
  Sean McGivern authored Sep 03, 2018
  
  5083bb09
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-03 · 3c256fa7
  GitLab Bot authored Sep 03, 2018
```
# Conflicts:
#	app/views/groups/labels/index.html.haml
#	config/initializers/1_settings.rb
#	doc/update/README.md

[ci skip]
```
  3c256fa7
- Update api/settings.md · 451fa7a1
  Marcel Amirault authored Jul 19, 2018
```
Fix spacing, typos, add missing settings, and remove deprecated ones.
```
  451fa7a1
- Merge branch 'docs/junit-examples' into 'master' · 31ead6cc
  Rémy Coutable authored Sep 03, 2018
```
Add JUnit Java examples in docs

See merge request gitlab-org/gitlab-ce!21472
```
  31ead6cc
- Merge branch 'sh-bump-gitlab-pages-v1.1.0' into 'master' · b2bdb004
  Nick Thomas authored Sep 03, 2018
```
Bump GitLab Pages to v1.1.0

See merge request gitlab-org/gitlab-ce!21419
```
  b2bdb004
- Update api/settings.md · eecdaa0b
  Marcel Amirault authored Jul 20, 2018
```
Fix spacing, typos, add missing settings, and remove deprecated ones.
```
  eecdaa0b
- Refactor Java JUnit reports examples · f2999c98
  Achilleas Pipinellis authored Sep 03, 2018
  
  f2999c98
- Merge branch 'fix-download-dropdown-link' into 'master' · 0e05e3a0
  Nick Thomas authored Sep 03, 2018
```
Hide PAT creation advice for HTTP clone if PAT exists

Closes #44111

See merge request gitlab-org/gitlab-ce!18208
```
  0e05e3a0
- Add Java Maven example to junit_test_reports.md · cc34f740
  Leo authored Aug 28, 2018
  
  cc34f740
- Merge branch 'fj-2635-enable-rss-for-tags' into 'master' · 4ee68672
  Sean McGivern authored Sep 03, 2018
```
Added atom feed for tags

Closes #2635

See merge request gitlab-org/gitlab-ce!21428
```
  4ee68672
- Added atom feed for tags · 0df18ca9
  Francisco Javier López authored Sep 03, 2018
  
  0df18ca9
- Update junit_test_reports.md by providing new example for java, using gradle build tool · 5fb044b0
  Maastiff authored Aug 31, 2018
  
  5fb044b0
- Merge branch 'add-additional-ce-images-kube-doc' into 'master' · 990278be
  Achilleas Pipinellis authored Sep 03, 2018
```
Add updated ce images to kubernetes install doc

See merge request gitlab-org/gitlab-ce!21418
```
  990278be
- Merge branch '5251_sast-for-groovy-docs' into 'master' · 2554a798
  Achilleas Pipinellis authored Sep 03, 2018
```
Update SAST supported language list

See merge request gitlab-org/gitlab-ee!7131
```
  2554a798
- Merge branch 'docs-port-ee-community-contributions' into 'master' · 8cb39fa8
  Achilleas Pipinellis authored Sep 03, 2018
```
Docs port ee community contributions

See merge request gitlab-org/gitlab-ce!21311
```
  8cb39fa8
- Merge branch 'patch-28' into 'master' · 0c8b219d
  Rémy Coutable authored Sep 03, 2018
```
Update gitlab_chart.md to fix example domain spelling missing "l"

See merge request gitlab-org/gitlab-ce!21462
```
  0c8b219d
- Merge branch '50564-chat-service-refactoring' into 'master' · 85b8206c
  Nick Thomas authored Sep 03, 2018
```
Use sample data if repo has no commit in ChatService

Closes #50564

See merge request gitlab-org/gitlab-ce!21440
```
  85b8206c
- Merge branch '4299_show_secure_results_on_environments_page_be' into 'master' · 08caac24
  Douwe Maan authored Sep 03, 2018
```
Show secure results on environments page, backend

See merge request gitlab-org/gitlab-ee!6987
```
  08caac24
- Show secure results on environments page, backend · ccc847db
  Gilbert Roulot authored Sep 03, 2018
  
  ccc847db
- Remove requires from email handlers · b07ca92f
  Sean McGivern authored Aug 28, 2018
  
  b07ca92f
- Add frozen_string_literal: true to email handlers · 55465747
  Sean McGivern authored Aug 23, 2018
  
  55465747
- Extract EE-specific lines from Gitlab::Email::Handler · 74616ece
  Sean McGivern authored Aug 23, 2018
  
  74616ece
- Remove requires from email handlers · 77f60b33
  Sean McGivern authored Aug 28, 2018
  
  77f60b33
- Add frozen_string_literal: true to email handlers · a159cc40
  Sean McGivern authored Aug 23, 2018
  
  a159cc40
- Extract EE-specific lines from Gitlab::Email::Handler · 37d8f324
  Sean McGivern authored Aug 23, 2018
  
  37d8f324
- Merge branch 'issue_48084' into 'master' · 91ed0dbc
  Sean McGivern authored Sep 03, 2018
```
Use a serializer to render diff lines

Closes #48084

See merge request gitlab-org/gitlab-ce!21260
```
  91ed0dbc
- Merge branch 'sh-bump-unauth-expiration' into 'master' · b5be01bc
  Douwe Maan authored Sep 03, 2018
```
Bump unauthenticated session time from 1 hour to 2 hours

Closes #50393

See merge request gitlab-org/gitlab-ce!21453
```
  b5be01bc