Commits · abc199c5448bceb518266b22ca4cac5d834015ab · nexedi / gitlab-ce

10 Mar, 2017 6 commits
- Try out the monkey patch to fix the middleware · abc199c5
  Lin Jen-Shin authored Mar 10, 2017
```
which isn't properly cleaning up whenever something
is thrown, not raised. See:

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108
```
  abc199c5
- Resolve conflicts after merging upstream/master · 2785b205
  Nick Thomas authored Mar 10, 2017
  
  2785b205
- Merge remote-tracking branch 'upstream/master' into ce-to-ee · 5e077b0f
  Nick Thomas authored Mar 10, 2017
  
  5e077b0f
- Merge branch 'ce-to-ee-update-doc-9-0' into 'master' · b2884238
  Rémy Coutable authored Mar 10, 2017
```
Add update doc for CE 9.0 to EE 9.0

See merge request !1394
```
  b2884238
- Merge branch '28447-hybrid-repository-storages-ee' into 'master' · 80d3020c
  Rémy Coutable authored Mar 10, 2017
```
Update storage settings to allow extra values per shard

See merge request !1362
```
  80d3020c
- Use common code blocks throughout the entire CE-to-EE docs · dbff9a74
  DJ Mountney authored Mar 09, 2017
  
  dbff9a74
09 Mar, 2017 21 commits
- Set up Database Cleaner for Geo database · 362aad89
  Douglas Barbosa Alexandre authored Mar 09, 2017
  
  362aad89
- Merge branch 'rs-upload-usage-data' into 'master' · fb322ac3
  Douwe Maan authored Mar 09, 2017
```
Add Upload count to usage data

See merge request !1401
```
  fb322ac3
- Fix two migrations to satisfy the Migration/AddConcurrentIndex cop · c3b9b439
  Nick Thomas authored Mar 09, 2017
  
  c3b9b439
- Fix two migrations to satisfy the Migration/AddConcurrentIndex cop · fc89169b
  Nick Thomas authored Mar 09, 2017
  
  fc89169b
- Fix groups_management spinach features to take account of reorganised project page · 088172b2
  Nick Thomas authored Mar 09, 2017
  
  088172b2
- Fix Projects::UpdateService#repository_storage spec to take account of schema... · 9aad2c0f
  Nick Thomas authored Mar 09, 2017
```
Fix Projects::UpdateService#repository_storage spec to take account of schema changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9597
```
  9aad2c0f
- Fix the #change_repository_storage tests to take account of schema changes in... · 67c96972
  Nick Thomas authored Mar 09, 2017
```
Fix the #change_repository_storage tests to take account of schema changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9597
```
  67c96972
- Add Upload count to usage data · a00c0f9e
  Robert Speicher authored Mar 09, 2017
  
  a00c0f9e
- Rename EE::Ci::RegisterBuildService -> EE::Ci::RegisterJobService · 322080ea
  Nick Thomas authored Mar 09, 2017
  
  322080ea
- Fix merge conflicts · 0472a881
  Nick Thomas authored Mar 09, 2017
  
  0472a881
- Merge remote-tracking branch 'ce/master' into ce-to-ee · 14bdd022
  Nick Thomas authored Mar 09, 2017
  
  14bdd022
- Merge branch 'storage-validation-improvement' into 'master' · 1df518ff
  Sean McGivern authored Mar 09, 2017
```
Improve storage validation after configuration structure update

See merge request !9811
```
  1df518ff
- Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' · 1dc2e185
  Kamil Trzciński authored Mar 09, 2017
```
Verbosify blocked pipeline status description

Closes #29134

See merge request !9800
```
  1dc2e185
- Merge branch 'change-activity-view-wording' into 'master' · 72e940df
  Dmitriy Zaporozhets authored Mar 09, 2017
```
Change activity view wording

See merge request !9777
```
  72e940df
- Merge branch 'ce-upstream' into 'master' · dd8d40c3
  Rémy Coutable authored Mar 09, 2017
```
CE upstream

Closes gitaly#109 and gitlab-ce#28515

See merge request !1371
```
  dd8d40c3
- Merge branch 'move-u2f-bundle' into 'master' · 69c1a9ae
  Alfredo Sumaran authored Mar 09, 2017
```
Move u2f javascript library to webpack config

See merge request !9755
```
  69c1a9ae
- Merge branch '28402-fix-starred-projects-filter-wrong-message-on-no-results' into 'master' · 19fd5920
  Rémy Coutable authored Mar 09, 2017
```
Fix wrong message on starred projects filtering

Closes #28402

See merge request !9488
```
  19fd5920
- Fix wrong message on starred projects filtering · 71eeb863
  George Andrinopoulos authored Mar 09, 2017
  
  71eeb863
- Merge branch 'update-templates-9-0' into 'master' · 71d371cf
  Robert Speicher authored Mar 09, 2017
```
Update the gitignore and gitlab-ci templates for 9.0

See merge request !9824
```
  71d371cf
- Merge branch 'master' into 'ce-upstream' · 24177b42
  Rémy Coutable authored Mar 09, 2017
```
# Conflicts:
#   doc/api/v3_to_v4.md
```
  24177b42
- Merge branch 'remove-awards-handler-spec-timeout' into 'master' · d643ba8b
  Clement Ho authored Mar 09, 2017
```
Remove timeout from awards_handler_spec.js

See merge request !9822
```
  d643ba8b
08 Mar, 2017 13 commits
- Update the gitignore and gitlab-ci templates for 9.0 · 65f6abff
  DJ Mountney authored Mar 08, 2017
  
  65f6abff
- Add update doc for CE 9.0 to EE 9.0 · 097ffe73
  DJ Mountney authored Mar 08, 2017
  
  097ffe73
- Rename builds_enabled to jobs_enabled and public_builds to public_jobs · 70e2c71e
  Rémy Coutable authored Mar 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  70e2c71e
- Merge branch '1381-present-commits-pagination-headers-correctly-ee' into 'master' · ee4d5504
  Rémy Coutable authored Mar 08, 2017
```
Port of 1381-present-commits-pagination-headers-correctly to EE

See merge request !1357
```
  ee4d5504
- Merge branch 'patch-13' into 'master' · 1110b2f1
  Rémy Coutable authored Mar 08, 2017
```
specify where to finish database HA setup

See merge request !9731
```
  1110b2f1
- Merge branch 'patch-15' into 'master' · 0933b9bb
  Rémy Coutable authored Mar 08, 2017
```
Fixed typo with project service documentation link

See merge request !9708
```
  0933b9bb
- Merge branch '29034-fix-github-importer' into 'master' · 58a19929
  Douwe Maan authored Mar 08, 2017
```
Fix name colision when importing GitHub pull requests from forked repositories

Closes #29034

See merge request !9719
```
  58a19929
- Merge branch '29162-refactor-dropdown-milestone-spec' into 'master' · f5c174a4
  Rémy Coutable authored Mar 08, 2017
```
Refactor dropdown_milestone_spec.rb

Closes #29162

See merge request !9814
```
  f5c174a4
- Merge branch '1861-squash-commits-fails-with-older-branches' into 'master' · 05dd95a2
  Rémy Coutable authored Mar 08, 2017
```
Resolve "Squash commits fails for branches named HEAD"

Closes #1861

See merge request !1391
```
  05dd95a2
- Merge branch 'es6-class-issue' into 'master' · 02fbdb8b
  Clement Ho authored Mar 08, 2017
```
Convert Issue into ES6 class

See merge request !9636
```
  02fbdb8b
- Merge branch '29165-subscribe-btn' into 'master' · a12664cd
  Alfredo Sumaran authored Mar 08, 2017
```
Remove hidden text from subscribe button

Closes #29165

See merge request !9790
```
  a12664cd
- Remove hidden text from subscribe button · b6b780cb
  Annabel Dunstone Gray authored Mar 08, 2017
  
  b6b780cb
- Merge branch 'rs-lower-capybara-timeout' into 'master' · 2d005670
  Rémy Coutable authored Mar 08, 2017
```
Decrease Capybara timeout for CI environment

Closes #29091

See merge request !9816
```
  2d005670