Commits · 4f277d3c13403369178a00cd882135b49048783f · nexedi / gitlab-ce

22 Aug, 2018 8 commits
- Merge branch 'ee-ide-file-templates-store' into 'master' · 4f277d3c
  Filipa Lacerda authored Aug 22, 2018
```
EE port of ide-file-templates-store

See merge request gitlab-org/gitlab-ee!6931
```
  4f277d3c
- Merge branch 'ce-to-ee-2018-08-21' into 'master' · cb9cdd16
  Rémy Coutable authored Aug 22, 2018
```
CE upstream - 2018-08-21 21:21 UTC

Closes gitlab-ce#40550

See merge request gitlab-org/gitlab-ee!6962
```
  cb9cdd16
- New replacement, keep single source of truth · 66066270
  Sid Sijbrandij authored Aug 22, 2018
  
  66066270
- added rewire comment to action default export · 198bb091
  Phil Hughes authored Aug 21, 2018
  
  198bb091
- Resolve config/routes.rb · abf0d4b3
  Rémy Coutable authored Aug 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  abf0d4b3
- Merge branch 'dz-add-ui-to-packages' into 'master' · 1c5192ed
  Dmitriy Zaporozhets authored Aug 22, 2018
```
Add UI for maven packages feature

See merge request gitlab-org/gitlab-ee!6781
```
  1c5192ed
- Update CHANGELOG.md for 11.2.0 · f5e65d42
  GitLab Release Tools Bot authored Aug 22, 2018
```
[ci skip]
```
  f5e65d42
- Update CHANGELOG-EE.md for 11.2.0-ee · 77f67ef2
  GitLab Release Tools Bot authored Aug 22, 2018
```
[ci skip]
```
  77f67ef2
21 Aug, 2018 32 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-21 · 62e53989
  GitLab Bot authored Aug 21, 2018
```
# Conflicts:
#	config/routes.rb

[ci skip]
```
  62e53989
- Merge branch 'ce-to-ee-2018-08-21' into 'master' · 26ba504e
  Rémy Coutable authored Aug 21, 2018
```
CE upstream - 2018-08-21 07:49 UTC

Closes gitlab-org/quality/staging#2

See merge request gitlab-org/gitlab-ee!6957
```
  26ba504e
- Merge branch 'arguments-keyword-sast' into 'master' · 382b6dab
  Mike Greiling authored Aug 21, 2018
```
Don't use arguments keyword in gettext script

Closes #50457

See merge request gitlab-org/gitlab-ce!21296
```
  382b6dab
- Merge branch '50101-move-test-files' into 'master' · a0c48d82
  Mike Greiling authored Aug 21, 2018
```
Moves spec files for job log components into components folder

See merge request gitlab-org/gitlab-ce!21303
```
  a0c48d82
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-08-21 · 1e4637ba
  Rémy Coutable authored Aug 21, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1e4637ba
- Resolve lib/api/services.rb · bfcc9126
  Rémy Coutable authored Aug 21, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bfcc9126
- Resolve doc/user/project/integrations/project_services.md · b9d4705d
  Rémy Coutable authored Aug 21, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b9d4705d
- Resolve changelogs/unreleased/6010_remove_gemnasium_service.yml · 809288df
  Rémy Coutable authored Aug 21, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  809288df
- Merge branch '50524-artifacts-sm' into 'master' · bb5c1af7
  Annabel Gray authored Aug 21, 2018
```
Resolve "Download artifacts button not available on mobile"

Closes #50524

See merge request gitlab-org/gitlab-ce!21332
```
  bb5c1af7
- Merge branch 'leipert-make--f-great-again-ee' into 'master' · d2989917
  Mike Greiling authored Aug 21, 2018
```
make `karma -f` work again

See merge request gitlab-org/gitlab-ee!6751
```
  d2989917
- Prevents package name of overflowing · e3c31a14
  Filipa Lacerda authored Aug 21, 2018
  
  e3c31a14
- Shows download artifacts button for pipelines on small screens · c773f24a
  Filipa Lacerda authored Aug 21, 2018
  
  c773f24a
- Add changelog for packages feature · a55880a0
  Dmitriy Zaporozhets authored Aug 21, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a55880a0
- Minor improvements to packages UI code · 1fb2de06
  Dmitriy Zaporozhets authored Aug 21, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1fb2de06
- Merge branch 'ce-to-ee-2018-08-21' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2018-08-21 · bc059221
  Chantal Rollison authored Aug 21, 2018
  
  bc059221
- Fixed issue_builder and merge_request_builder related conflicts. · 96658b6d
  Chantal Rollison authored Aug 21, 2018
  
  96658b6d
- Update README.md · f0cdb9f6
  Ray Paik authored Aug 21, 2018
  
  f0cdb9f6
- Merge branch 'update-chart-for-ga-doc' into 'master' · d2590b15
  Achilleas Pipinellis authored Aug 21, 2018
```
Update `gitlab` chart docs for GA

See merge request gitlab-org/gitlab-ce!21215
```
  d2590b15
- Update `gitlab` chart docs for GA · 94a812f5
  Joshua Lambert authored Aug 21, 2018
  
  94a812f5
- Merge branch 'update-chart-for-ga-doc-ee' into 'master' · cb176b6c
  Achilleas Pipinellis authored Aug 21, 2018
```
Update `gitlab` chart docs for GA

See merge request gitlab-org/gitlab-ee!6958
```
  cb176b6c
- Update `gitlab` chart docs for GA · d5b9d83d
  Achilleas Pipinellis authored Aug 21, 2018
  
  d5b9d83d
- Fix styling issues in ee/app/views/projects/packages/packages/index.html.haml · 8e4bca45
  Dmitriy Zaporozhets authored Aug 21, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8e4bca45
- Uses responsive table for index page · 3dadfcba
  Filipa Lacerda authored Aug 21, 2018
```
Updates detail page header to overflow properly on mobile
```
  3dadfcba
- Merge branch 'tc-api-fork-owners' into 'master' · 5dac2937
  Grzegorz Bizon authored Aug 21, 2018
```
Allow project owners to set up forking relation through API

Closes #40550

See merge request gitlab-org/gitlab-ce!18104
```
  5dac2937
- Merge branch 'ee-tc-api-fork-owners' into 'master' · 2485cf73
  Grzegorz Bizon authored Aug 21, 2018
```
Port of tc-api-fork-owners to EE

Closes gitlab-ce#40550

See merge request gitlab-org/gitlab-ee!6956
```
  2485cf73
- Merge branch '49993-fix-remember-sorting-issue-mr' into 'master' · c0dcf8ce
  Sean McGivern authored Aug 21, 2018
```
Resolve "Separate remembering sorting issues/merge requests"

Closes #49993

See merge request gitlab-org/gitlab-ce!21153
```
  c0dcf8ce
- Resolve "Separate remembering sorting issues/merge requests" · 9922593f
  🙈 jacopo beschi 🙉 authored Aug 21, 2018
  
  9922593f
- Merge branch 'ce-6752-jira-branches' into 'master' · c62e9c82
  Sean McGivern authored Aug 21, 2018
```
Backport of gitlab-org/gitlab-ee!6876

See merge request gitlab-org/gitlab-ce!21266
```
  c62e9c82
- Merge branch '6752-jira-branches' into 'master' · 9dc0317b
  Sean McGivern authored Aug 21, 2018
```
Resolve "All Gitlab branches listed in Jira task in Development section"

Closes #6752

See merge request gitlab-org/gitlab-ee!6876
```
  9dc0317b
- Merge branch '7175-protected-environments-use-limited-count-approach-ee' into 'master' · c712406c
  Grzegorz Bizon authored Aug 21, 2018
```
Resolve "Follow up - Protected Environments: Use limited count approach"

Closes #7175

See merge request gitlab-org/gitlab-ee!6897
```
  c712406c
- Merge branch '49179-fill-with-js-directly-qa' into 'master' · cc0bf2f6
  Grzegorz Bizon authored Aug 21, 2018
```
Resolve "[QA] Automation Triage 11.1.0 RC9 - Filling textarea with deploy key timeouts sometime"

Closes #49179

See merge request gitlab-org/gitlab-ce!21258
```
  cc0bf2f6
- Fixed autocomplete related conflicts · 55f044ae
  Yorick Peterse authored Aug 21, 2018
  
  55f044ae