Commits · 8becac7df8c166eca5c50176db3157464dceac56 · nexedi / gitlab-ce

04 Sep, 2018 13 commits
- New translations gitlab.pot (Russian) · 8becac7d
  GitLab Crowdin Bot authored Sep 04, 2018
```
[skip ci]
```
  8becac7d
- New translations gitlab.pot (Spanish) · 97561d33
  GitLab Crowdin Bot authored Sep 04, 2018
```
[skip ci]
```
  97561d33
- New translations gitlab.pot (Turkish) · cf7a89f1
  GitLab Crowdin Bot authored Sep 04, 2018
```
[skip ci]
```
  cf7a89f1
- New translations gitlab.pot (German) · 95864029
  GitLab Crowdin Bot authored Sep 04, 2018
```
[skip ci]
```
  95864029
- New translations gitlab.pot (Albanian) · d290d344
  GitLab Crowdin Bot authored Sep 04, 2018
```
[skip ci]
```
  d290d344
- Merge branch '7180-weight-feature-in-community-edition-buggy-in-board-view' into 'master' · 80b04672
  Phil Hughes authored Sep 04, 2018
```
Resolve "Weight Feature in Community Edition buggy in board view"

Closes #7180

See merge request gitlab-org/gitlab-ee!6864
```
  80b04672
- Resolve "Weight Feature in Community Edition buggy in board view" · f4e4a9ad
  Simon Knox authored Sep 04, 2018
  
  f4e4a9ad
- Merge branch 'ce-to-ee-2018-09-04' into 'master' · cbf5b26d
  Stan Hu authored Sep 04, 2018
```
CE upstream - 2018-09-04 06:21 UTC

See merge request gitlab-org/gitlab-ee!7221
```
  cbf5b26d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-04 · 534a230e
  GitLab Bot authored Sep 04, 2018
  
  534a230e
- Merge branch 'move-cache-vs-artifacts' into 'master' · 8ff02cf7
  Sid Sijbrandij authored Sep 04, 2018
```
Make cache vs artifacts section more visible, and minor enhancements to text.

See merge request gitlab-org/gitlab-ce!21491
```
  8ff02cf7
- Merge branch '44750-should-we-still-use-flay' into 'master' · a747abbc
  Robert Speicher authored Sep 04, 2018
```
Resolve "Should we still use Flay?"

Closes #44750

See merge request gitlab-org/gitlab-ce!21476
```
  a747abbc
- Merge branch 'ce-to-ee-2018-09-03' into 'master' · b7adbe7f
  Robert Speicher authored Sep 04, 2018
```
CE upstream - 2018-09-03 15:21 UTC

See merge request gitlab-org/gitlab-ee!7213
```
  b7adbe7f
- Make cache vs artifacts section more visible, and minor enhancements to text. · be499414
  Evan Read authored Sep 04, 2018
  
  be499414
03 Sep, 2018 27 commits
- Only GCP · 658cd117
  Sid Sijbrandij authored Sep 03, 2018
  
  658cd117
- Merge branch 'bvl-update-install-docs-11-3' into 'master' · 7360fa4e
  Achilleas Pipinellis authored Sep 03, 2018
```
Update installation and update docs for 11.3

See merge request gitlab-org/gitlab-ce!21481
```
  7360fa4e
- Merge branch 'bvl-update-ce-to-ee-docs' into 'master' · 2ce50843
  Achilleas Pipinellis authored Sep 03, 2018
```
Update CE-to-EE docs for 11.3

See merge request gitlab-org/gitlab-ee!7216
```
  2ce50843
- Resolve locale/gitlab.pot · fc2a35b0
  Rémy Coutable authored Sep 03, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fc2a35b0
- Update CE-to-EE docs for 11.3 · ed9f5957
  Bob Van Landuyt authored Sep 03, 2018
  
  ed9f5957
- Resolve doc/api/settings.md · cd766d23
  Rémy Coutable authored Sep 03, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cd766d23
- Update installation and update docs for 11.3 · fabba7c9
  Bob Van Landuyt authored Sep 03, 2018
  
  fabba7c9
- Resolve lib/gitlab/email/handler.rb · e3cbf0ba
  Sean McGivern authored Sep 03, 2018
  
  e3cbf0ba
- 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
- Stop using Flay · 3a35a03f
  Rémy Coutable authored Sep 03, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3a35a03f
- 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