Commits · 8f3fa21c9e22355e162a1a8119416b6dcee2c4bc · nexedi / gitlab-ce

28 Feb, 2018 31 commits
- Merge branch 'docs-geo-10-5-improvements' into 'master' · 8f3fa21c
  Nick Thomas authored Feb 28, 2018
```
Improve Geo documentation

Closes #4921, #4889, #4883, #4892, #4882, #4886, #4890, and #4482

See merge request gitlab-org/gitlab-ee!4585
```
  8f3fa21c
- Improve Geo documentation · 68bb1d0d
  Gabriel Mazetto authored Feb 28, 2018
  
  68bb1d0d
- Merge branch 'add-edge-cases-to-include-documentation' into 'master' · 1fc7ad5f
  Kamil Trzciński authored Feb 28, 2018
```
Document edge cases for gitlab-ci.yml `include` keyword

Closes #5025 and #5028

See merge request gitlab-org/gitlab-ee!4711
```
  1fc7ad5f
- Document edge cases for gitlab-ci.yml `include` keyword · 43f432c2
  Mayra Cabrera authored Feb 28, 2018
  
  43f432c2
- Merge branch 'docs-add-note-dot-com-tiers-ee' into 'master' · 61bdccf4
  Marcia Ramos authored Feb 28, 2018
```
Docs: explain feature availability in GitLab.com

See merge request gitlab-org/gitlab-ee!4703
```
  61bdccf4
- Docs: explain feature availability in GitLab.com · fc42b517
  Marcia Ramos authored Feb 28, 2018
  
  fc42b517
- Merge branch 'geo-file-transfer-improve-logging' into 'master' · e2ad967f
  Stan Hu authored Feb 28, 2018
```
Add extra parameters to geo file transfer log

See merge request gitlab-org/gitlab-ee!4761
```
  e2ad967f
- Merge branch '5040-sast-documentation-snippet-is-invalid' into 'master' · 3c2bf60c
  Dmitriy Zaporozhets authored Feb 28, 2018
```
Resolve "SAST documentation snippet is invalid"

Closes #5040

See merge request gitlab-org/gitlab-ee!4721
```
  3c2bf60c
- Resolve "SAST documentation snippet is invalid" · 93492538
  Philippe Lafoucrière authored Feb 28, 2018
  
  93492538
- Merge branch 'bvl-fix-qa-doorkeeper' into 'master' · cf3bf235
  Grzegorz Bizon authored Feb 28, 2018
```
Specify base controller for Doorkeeper

Closes gitlab-qa#198

See merge request gitlab-org/gitlab-ee!4743
```
  cf3bf235
- Add extra parameters to geo file transfer logging · c9454ea9
  Valery Sizov authored Feb 28, 2018
  
  c9454ea9
- Merge branch 'ce-to-ee-2018-02-27' into 'master' · 5a33ee0f
  Rémy Coutable authored Feb 28, 2018
```
CE upstream - 2018-02-27 22:10 UTC

See merge request gitlab-org/gitlab-ee!4754
```
  5a33ee0f
- Merge branch 'ee-refactor/move-assignees-vue-component' into 'master' · 47b51c11
  Filipa Lacerda authored Feb 28, 2018
```
Move Assignees vue component

See merge request gitlab-org/gitlab-ee!4467
```
  47b51c11
- Specify base controller for Doorkeeper · e0eeace3
  Bob Van Landuyt authored Feb 27, 2018
```
This will make sure the `ApplicantionController#can?` method is
available for views rendering menus based on the current user's abilities.
```
  e0eeace3
- resolve conflict · f7351ec0
  Simon Knox authored Feb 28, 2018
```
content is the same as init_merge_request_show.js
```
  f7351ec0
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-02-27 · e8dd920a
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e8dd920a
- fix bad import · 7d815a71
  Simon Knox authored Feb 28, 2018
  
  7d815a71
- remove deleted partial · 6b0d8ae1
  Simon Knox authored Feb 28, 2018
  
  6b0d8ae1
- fix error on MR page - don't load CE sidebar bundle on EE · 2e09574f
  Simon Knox authored Feb 28, 2018
  
  2e09574f
- fix error in Issue page - don't load CE issue sidebar bundle on EE page · 3842e68f
  Simon Knox authored Feb 28, 2018
  
  3842e68f
- Merge branch 'remove-merge-conflicts-bundle-ee' into 'master' · 94d7e98e
  Jacob Schatz authored Feb 28, 2018
```
Port of "Remove merge_conflicts bundle" to EE

See merge request gitlab-org/gitlab-ee!4758
```
  94d7e98e
- Merge branch '1674-weight-desc-nullfix' into 'master' · 1143eb64
  Nick Thomas authored Feb 28, 2018
```
Issue - fix order_weight_desc so null weights are placed at the end

Closes #1674

See merge request gitlab-org/gitlab-ee!4714
```
  1143eb64
- Issue - fix order_weight_desc so null weights are placed at the end · c6ad1f01
  Mario de la Ossa authored Feb 28, 2018
  
  c6ad1f01
- restore CE version of route to reduce possibility for conflicts · 44c82950
  Mike Greiling authored Feb 27, 2018
  
  44c82950
- remove duplicate common and common_vue definitions · 8a0a927f
  Mike Greiling authored Feb 27, 2018
  
  8a0a927f
- refactor merge conflicts bundle to reduce side effects · 2a1e5d4d
  Mike Greiling authored Feb 27, 2018
  
  2a1e5d4d
- remove merge_conflicts bundle in favor of pages directory entry point · 5781f80e
  Mike Greiling authored Feb 27, 2018
  
  5781f80e
- Fix typo in epic_reference_filter.rb: project -> group · 6fc434bb
  Stan Hu authored Feb 27, 2018
  
  6fc434bb
- Resolve build failures in ee/lib/ee/banzai/filter/epic_reference_filter.rb · a666a2a1
  Stan Hu authored Feb 27, 2018
  
  a666a2a1
- Merge branch 'ee-acet-mr-notes-index' into 'master' · 85ff85f1
  Jacob Schatz authored Feb 28, 2018
```
MR Notes Refactor

See merge request gitlab-org/gitlab-ee!4245
```
  85ff85f1
- MR Notes Refactor · 6d3648af
  Fatih Acet authored Feb 28, 2018
  
  6d3648af
27 Feb, 2018 9 commits
- Merge branch '5063-fix-ee-files-location-check-ee' into 'master' · 8660f732
  Robert Speicher authored Feb 27, 2018
```
Resolve "ee-files-location-check bug for non-'gitlab-org' repo-based MRs"

Closes #5063

See merge request gitlab-org/gitlab-ee!4746
```
  8660f732
- Merge branch 'ee-profile-bundle-tag-refactor' into 'master' · 4617a251
  Jacob Schatz authored Feb 27, 2018
```
EE profile bundle tag refactor

See merge request gitlab-org/gitlab-ee!4708
```
  4617a251
- Merge branch 'master' into ce-to-ee-2018-02-27 · 9b7c2a90
  Stan Hu authored Feb 27, 2018
  
  9b7c2a90
- Resolve conflicts in config/webpack.config.js · d29dc55d
  Stan Hu authored Feb 27, 2018
  
  d29dc55d
- Resolve conflict in app/views/projects/merge_requests/show.html.haml · 0daf3be9
  Stan Hu authored Feb 27, 2018
  
  0daf3be9
- Merge branch 'ee-remove-snippets-bundle' into 'master' · 1e9c58a5
  Jacob Schatz authored Feb 27, 2018
```
Remove snippet bundle webpack entry point (EE)

See merge request gitlab-org/gitlab-ee!4730
```
  1e9c58a5
- Remove snippet bundle webpack entry point (EE) · 02fc042d
  Clement Ho authored Feb 27, 2018
  
  02fc042d
- Resolve conflicts in app/services/members/destroy_service.rb · 847ca9d5
  Stan Hu authored Feb 27, 2018
  
  847ca9d5
- Resovle conflict in app/services/members/update_service.rb · 7548c9aa
  Stan Hu authored Feb 27, 2018
  
  7548c9aa