Commits · 29fe5d4dfae37d1dba986687108f55acc1ca1180 · nexedi / gitlab-ce

03 Aug, 2017 9 commits
- Merge branch 'ce-to-ee-2017-07-28' into 'master' · 29fe5d4d
  Rémy Coutable authored Aug 03, 2017
```
CE upstream - Friday

Closes gitaly#408, gitaly#411, and #1827

See merge request !2554
```
  29fe5d4d
- Remove :empty_project factory from spec/requests/api/merge_requests_spec.rb · 2ede81d2
  Nick Thomas authored Aug 03, 2017
  
  2ede81d2
- Merge branch 'ee-sidebar-fly-out-sub-nav' into 'master' · 51fe933c
  Filipa Lacerda authored Aug 03, 2017
```
EE port of sidebar-fly-out-sub-nav

See merge request !2576
```
  51fe933c
- Fix merge conflicts · d90f9c52
  Nick Thomas authored Aug 03, 2017
  
  d90f9c52
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28 · 811c0255
  Nick Thomas authored Aug 03, 2017
  
  811c0255
- Try to fix some EE protected branches specs · 745db030
  Nick Thomas authored Aug 03, 2017
  
  745db030
- Merge branch 'sh-add-cursor-update-logging' into 'master' · e09a5a90
  Rémy Coutable authored Aug 03, 2017
```
Add structured log messages to Geo LogCursor

See merge request !2574
```
  e09a5a90
- Merge branch 'rs-empty_project-default-ee' into 'master' · cf27ede3
  Rémy Coutable authored Aug 03, 2017
```
[EE] Empty project factory by default

See merge request !2585
```
  cf27ede3
- Remove EE-specific usages of `:empty_project` · f81df0d4
  Robert Speicher authored Aug 02, 2017
  
  f81df0d4
02 Aug, 2017 23 commits
- Change all `:empty_project` to `:project` · 17f36d4b
  Robert Speicher authored Aug 02, 2017
  
  17f36d4b
- Remove `:empty_project` factory, implement `:repository` trait · 037a62f3
  Robert Speicher authored Aug 02, 2017
  
  037a62f3
- Remove documentation about `:empty_project` since we're removing it · 89c73add
  Robert Speicher authored Aug 02, 2017
  
  89c73add
- Use `:empty_project` where possible in features/steps · 44a36b89
  Robert Speicher authored Aug 02, 2017
  
  44a36b89
- Merge branch 'add-filtered-search-group-issues-ee' into 'master' · d4b2c53d
  Phil Hughes authored Aug 02, 2017
```
Add filtered search to group issue dashboard (EE)

See merge request !2581
```
  d4b2c53d
- Add filtered search to group issue dashboard (EE) · dde689ef
  Clement Ho authored Aug 02, 2017
  
  dde689ef
- Merge branch 'master' into ee-sidebar-fly-out-sub-nav · d8698f6e
  Phil Hughes authored Aug 02, 2017
  
  d8698f6e
- Merge branch 'ee-34027-add-icons-to-sidebar' into 'master' · 16c0b6e1
  Phil Hughes authored Aug 02, 2017
```
Port of 34027-add-icons-to-sidebar to EE

See merge request !2568
```
  16c0b6e1
- Merge branch 'fix-browsing-artifacts-on-object-storage' into 'master' · f451e113
  Sean McGivern authored Aug 02, 2017
```
Fix accessing individual files when artifacts are on object storage

See merge request !2564
```
  f451e113
- Merge branch 'update-milestone-docs' into 'master' · 6d5a407c
  Sean McGivern authored Aug 02, 2017
```
Update milestone docs EE

See merge request !2567
```
  6d5a407c
- Update milestone docs EE · 7d6ecd66
  Victor Wu authored Aug 02, 2017
  
  7d6ecd66
- Port of 34027-add-icons-to-sidebar to EE · e270eb2e
  Annabel Dunstone Gray authored Jul 31, 2017
  
  e270eb2e
- EE port of sidebar-fly-out-sub-nav · cde2d2bb
  Phil Hughes authored Aug 02, 2017
  
  cde2d2bb
- Fix artifacts controller spec for object stores · 9084b572
  Sean McGivern authored Aug 02, 2017
  
  9084b572
- Resolve conflicts · 1c93759b
  Nick Thomas authored Aug 02, 2017
  
  1c93759b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28 · 5b34ce46
  Nick Thomas authored Aug 02, 2017
  
  5b34ce46
- Merge branch 'rs-empty_project-cleanup-ee' into 'master' · 855c457a
  Rémy Coutable authored Aug 02, 2017
```
[EE] Ensure all project factories use `:repository` trait or `:empty_project`

See merge request !2570
```
  855c457a
- CI fixes for gitaly-ruby · 26fb08f8
  Jacob Vosmaer authored Jul 31, 2017
  
  26fb08f8
- Merge branch 'sh-fix-geo-log-helper' into 'master' · 5060d9ed
  Rémy Coutable authored Aug 02, 2017
```
Fix LogCursor error message handler

See merge request !2575
```
  5060d9ed
- Fix LogCursor error message handler · 39e19004
  Stan Hu authored Aug 01, 2017
```
Serializing this to JSON would dump some odd text with "iseq".
```
  39e19004
- Add structured log messages to Geo LogCursor · 1857a2c8
  Stan Hu authored Aug 01, 2017
```
Primarily adds messages for the the full table scan and repository update
events.
```
  1857a2c8
- Merge branch '3067-remove-rspec-mock-warninging-geo-related-project-spec' into 'master' · 767d0950
  Robert Speicher authored Aug 02, 2017
```
Resolve "rspec-mock warning in a Geo-related project spec"

Closes #3067

See merge request !2573
```
  767d0950
- Remove rspec-mock warning in a Geo-related project spec · 41ba14e8
  Douglas Barbosa Alexandre authored Aug 01, 2017
  
  41ba14e8
01 Aug, 2017 8 commits
- EE-specific changes for `:empty_project` and `:repository` · 694f84e1
  Robert Speicher authored Aug 01, 2017
  
  694f84e1
- Fix accessing individual files when artifacts are on object storage · bbd2a964
  Kamil Trzcinski authored Aug 01, 2017
  
  bbd2a964
- Ensure all project factories use `:repository` trait or `:empty_project` · a15efe37
  Robert Speicher authored Aug 01, 2017
  
  a15efe37
- Merge branch 'group-contribution-analytics-new-nav' into 'master' · 5a9b6b5e
  Filipa Lacerda authored Aug 01, 2017
```
Added group contribution analytics to new sidebar

Closes #3063 and gitlab-ce#35824

See merge request !2565
```
  5a9b6b5e
- Resolve conflicts · 785837c4
  Nick Thomas authored Aug 01, 2017
  
  785837c4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28 · f91e92ef
  Nick Thomas authored Aug 01, 2017
  
  f91e92ef
- Add option to use CommitLanguages RPC · 5cae41b1
  Jacob Vosmaer authored Jul 31, 2017
  
  5cae41b1
- Merge branch 'commits-are-ancestors' into 'master' · a770e807
  Sean McGivern authored Aug 01, 2017
```
Prevent mirror service from calling Gitaly too much

Closes gitaly#418

See merge request !2566
```
  a770e807