Commits · 66db55319054d6988bc8efd8fab9b59377907ef5 · nexedi / gitlab-ce

06 Jul, 2018 32 commits
- Disable public_send for our preview mailers · 66db5531
  Lin Jen-Shin authored Jul 06, 2018
  
  66db5531
- Move spec/mailers/previews to app/mailers/previews · c8338193
  Lin Jen-Shin authored Jul 06, 2018
  
  c8338193
- Merge branch '6653-extract-ee-specific-files-lines-for-discussion-app-services' into 'master' · 34fe3274
  Douwe Maan authored Jul 06, 2018
```
Extract EE-specific lines from NotificationService

See merge request gitlab-org/gitlab-ce!20406
```
  34fe3274
- Merge branch 'build-chunks-on-object-storage' into 'master' · 9c720a98
  Grzegorz Bizon authored Jul 06, 2018
```
Allow to store BuildTraceChunks on Object Storage

Closes #45712

See merge request gitlab-org/gitlab-ce!19515
```
  9c720a98
- Extract EE-specific lines from NotificationService · 4b7f035a
  Sean McGivern authored Jul 05, 2018
  
  4b7f035a
- Merge branch 'gitaly-conflicts-find-commit' into 'master' · bf9fd9c3
  Douwe Maan authored Jul 06, 2018
```
Partially revert "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'""

See merge request gitlab-org/gitlab-ce!20422
```
  bf9fd9c3
- Merge branch 'ce-5605-epic-autocomplete' into 'master' · b25a4409
  Sean McGivern authored Jul 06, 2018
```
Backport of EE changes "Add support for autocompleting Epics and Labels within Epics"

See merge request gitlab-org/gitlab-ce!20419
```
  b25a4409
- Merge branch 'ide-merge-request-info' into 'master' · 33116c22
  Sean McGivern authored Jul 06, 2018
```
Added merge request info to Web IDE sidebar

Closes #45187

See merge request gitlab-org/gitlab-ce!19860
```
  33116c22
- Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master' · b0fa01fc
  Douwe Maan authored Jul 06, 2018
```
Resolve "Undefined omniauth_authorize_path when omniauth_enabled not enabled"

Closes #48677

See merge request gitlab-org/gitlab-ce!20302
```
  b0fa01fc
- Merge branch 'bvl-wrap-cross-project-group-permissions' into 'master' · afb3caac
  Douwe Maan authored Jul 06, 2018
```
Create cross project group features

See merge request gitlab-org/gitlab-ce!20333
```
  afb3caac
- Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"" · 9f832699
  Jacob Vosmaer authored Jul 06, 2018
```
This partially reverts commit 64dfe2cb.
```
  9f832699
- Merge branch 'jprovazn-label-links-update' into 'master' · f5b12225
  Sean McGivern authored Jul 06, 2018
```
Fix cross-project label references

Closes #45539

See merge request gitlab-org/gitlab-ce!20308
```
  f5b12225
- Merge branch 'remove-trace-efficiently' into 'master' · 68d138e8
  Kamil Trzciński authored Jul 06, 2018
```
Remove redundant query when removing trace

See merge request gitlab-org/gitlab-ce!20324
```
  68d138e8
- Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6195 · 389a22e7
  Mark Chao authored Jul 06, 2018
```
Refactor AutocompleteSources#label:

1. The return value was inconsistent, sometimes returning a hash and sometimes returning an ActiveModel.
2. It was inconsistent with respect to other methods in the class since they all return ActiveModels.
```
  389a22e7
- fixed misaligned icon · ed85787f
  Phil Hughes authored Jul 06, 2018
  
  ed85787f
- Merge branch 'fix-trace-archive-cron-worker-race-condition' into 'master' · 82f6b4b0
  Kamil Trzciński authored Jul 06, 2018
```
Check if the existences of archived traces before archive it

Closes #48705

See merge request gitlab-org/gitlab-ce!20297
```
  82f6b4b0
- Fix static analysys · f60ffd54
  Shinya Maeda authored Jul 06, 2018
  
  f60ffd54
- Merge branch 'move-contributing-link-to-partial-for-ee-exclusion' into 'master' · a29124bf
  Phil Hughes authored Jul 06, 2018
```
CE for "Remove new contributing link from EE"

See merge request gitlab-org/gitlab-ce!20334
```
  a29124bf
- CE for "Remove new contributing link from EE" · d06b3664
  Luke Bennett authored Jul 06, 2018
  
  d06b3664
- Merge branch 'fj-43565-wrong-role-displayed' into 'master' · 19e85cc8
  Douwe Maan authored Jul 06, 2018
```
Fix User role displayed on projects dashboard

Closes #43565

See merge request gitlab-org/gitlab-ce!20374
```
  19e85cc8
- Fix User role displayed on projects dashboard · 837c3b3d
  Francisco Javier López authored Jul 06, 2018
  
  837c3b3d
- Create cross project group features · a57ec31e
  Bob Van Landuyt authored Jul 03, 2018
```
This allows us to check specific abilities in views, while still
enabling/disabling them at once.
```
  a57ec31e
- Add spec · 9bdb4b17
  Shinya Maeda authored Jul 06, 2018
  
  9bdb4b17
- Merge branch '31583-osw-gfm-complete-status-indication' into 'master' · 83f79ced
  Sean McGivern authored Jul 06, 2018
```
Resolve "GFM preview should have status indicator"

Closes #31583

See merge request gitlab-org/gitlab-ce!20418
```
  83f79ced
- Revice the changelog · 18238cac
  Shinya Maeda authored Jul 06, 2018
  
  18238cac
- Remove raising error at erase_old_trace! · a52b1f24
  Shinya Maeda authored Jul 06, 2018
  
  a52b1f24
- Merge branch 'master' into remove-trace-efficiently · 334ed9c5
  Shinya Maeda authored Jul 06, 2018
  
  334ed9c5
- Use AlreadyArchivedError if it's the case · 1667b65c
  Shinya Maeda authored Jul 06, 2018
  
  1667b65c
- Merge branch 'master' into fix-trace-archive-cron-worker-race-condition · 9c9bb49b
  Shinya Maeda authored Jul 06, 2018
  
  9c9bb49b
- Add spec for the ordering of the data stores · 21399fbc
  Shinya Maeda authored Jul 06, 2018
  
  21399fbc
- Merge branch 'master' into build-chunks-on-object-storage · 25bd5413
  Shinya Maeda authored Jul 06, 2018
  
  25bd5413
- Present state indication on GFM preview · d038fac4
  Oswaldo Ferreira authored Jul 05, 2018
  
  d038fac4
05 Jul, 2018 8 commits
- Merge branch '48803-mrs-are-showing-some-discussions-as-unresolved' into 'master' · 969b7c56
  Fatih Acet authored Jul 05, 2018
```
Resolve "MRs are showing some discussions as unresolved"

Closes #48803

See merge request gitlab-org/gitlab-ce!20351
```
  969b7c56
- Resolve "MRs are showing some discussions as unresolved" · 9dc6b039
  Simon Knox authored Jul 05, 2018
  
  9dc6b039
- Fixed pluck and renamed methods · 2d2adf42
  Jan Provaznik authored Jul 05, 2018
  
  2d2adf42
- Merge branch 'add-why-gitlab-to-cc-readme' into 'master' · 5e70a094
  Sid Sijbrandij authored Jul 05, 2018
```
Add "Why GitLab?" page to GitLab CE README

See merge request gitlab-org/gitlab-ce!20415
```
  5e70a094
- Merge branch 'ce-6145-unify-issuable-search-bar' into 'master' · dc6c89cc
  Robert Speicher authored Jul 05, 2018
```
CE: Unify app/views/shared/issuable/_search_bar.html.haml

See merge request gitlab-org/gitlab-ce!20266
```
  dc6c89cc
- Merge branch... · 48d1f3d6
  Robert Speicher authored Jul 05, 2018
```
Merge branch '48893-getting-undefined-local-variable-or-method-page-for-errors-in-qa-jobs' into 'master'

Resolve "Getting "undefined local variable or method `page' for" errors in QA jobs"

Closes #48893

See merge request gitlab-org/gitlab-ce!20410
```
  48d1f3d6
- Update README.md · e16dcfdf
  Andreas Kämmerle authored Jul 05, 2018
  
  e16dcfdf
- Merge branch 'docs/container-scanning-note' into 'master' · 4d2e24ed
  Achilleas Pipinellis authored Jul 05, 2018
```
Verify version on container scanning note

See merge request gitlab-org/gitlab-ce!20409
```
  4d2e24ed