Commits · 2ed72580591315c729a32ca6c6481d4100e71349 · nexedi / gitlab-ce

13 Oct, 2017 7 commits
- Merge branch 'sh-remove-exec-permission-favicon' into 'master' · 2ed72580
  Achilleas Pipinellis authored Oct 13, 2017
```
Remove +x permission from app/assets/images/favicon-green.ico

See merge request gitlab-org/gitlab-ee!3138
```
  2ed72580
- Merge branch 'sh-geo-fix-file-download-errors' into 'master' · 58397d10
  Nick Thomas authored Oct 13, 2017
```
Geo: Properly check return value of file download return codes

Closes #3749

See merge request gitlab-org/gitlab-ee!3143
```
  58397d10
- Merge branch 'ff-rebase-docs' into 'master' · f797d84c
  Sean McGivern authored Oct 13, 2017
```
ff-rebase-docs

See merge request gitlab-org/gitlab-ee!3137
```
  f797d84c
- ff-rebase-docs · 9130e37c
  Victor Wu authored Oct 13, 2017
  
  9130e37c
- Merge branch '3742-geo-node-status-service-bug' into 'master' · 629b5303
  Stan Hu authored Oct 13, 2017
```
Fix reading the status of a secondary Geo node from the primary

Closes #3742

See merge request gitlab-org/gitlab-ee!3140
```
  629b5303
- Merge branch 'ce-to-ee-2017-10-11' into 'master' · 727af20c
  Rémy Coutable authored Oct 13, 2017
```
CE upstream - Wednesday

Closes gitlab-com/support-forum#2476

See merge request gitlab-org/gitlab-ee!3121
```
  727af20c
- Geo: Properly check return value of file download return codes · b1664a69
  Stan Hu authored Oct 13, 2017
```
Closes #3749
```
  b1664a69
12 Oct, 2017 18 commits
- Fix reading the status of a secondary Geo node from the primary · afc76744
  Nick Thomas authored Oct 12, 2017
  
  afc76744
- Remove +x permission from app/assets/images/favicon-green.ico · 09ae4de4
  Stan Hu authored Oct 12, 2017
  
  09ae4de4
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-10-11 · 5049eb42
  Rémy Coutable authored Oct 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5049eb42
- Fix specs · edb14ef4
  Annabel Dunstone Gray authored Oct 12, 2017
  
  edb14ef4
- Merge branch 'ee-3662-board_routes_prefix_with_dash' into 'master' · bd7ba308
  Douwe Maan authored Oct 12, 2017
```
Move group boards routes under '-' and remove "boards" from reserved paths

Closes #3662

See merge request gitlab-org/gitlab-ee!3078
```
  bd7ba308
- Merge branch 'add-10.1-ce-to-ee-docs' into 'master' · 88f46f7d
  Robert Speicher authored Oct 12, 2017
```
Add 10.1 CE to EE docs

See merge request gitlab-org/gitlab-ee!3133
```
  88f46f7d
- Add 10.1 CE to EE docs · 8ee6110a
  Lin Jen-Shin authored Oct 12, 2017
```
Followed the instructions from:
https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#gitlab-ee
```
  8ee6110a
- Specs for new group routing · d85bbf0d
  Valery Sizov authored Oct 12, 2017
  
  d85bbf0d
- Merge branch 'BDO-minor-spelling-edit' into 'master' · 3429442a
  Douwe Maan authored Oct 12, 2017
```
Fix spelling of 'Enterprise'

See merge request gitlab-org/gitlab-ee!3114
```
  3429442a
- Merge branch 'docs/gke-cluster-ee' into 'master' · ec186e1d
  Achilleas Pipinellis authored Oct 12, 2017
```
Add docs for GKE integration

See merge request gitlab-org/gitlab-ee!3129
```
  ec186e1d
- Merge branch 'docs/gke-cluster' into 'master' · e1e4745b
  Achilleas Pipinellis authored Oct 12, 2017
```
Add docs for GKE integration

See merge request gitlab-org/gitlab-ce!14712
```
  e1e4745b
- Merge branch 'docs/fix-dev-doc-ee' into 'master' · ba5407bf
  Achilleas Pipinellis authored Oct 12, 2017
```
Fix a missing link and create a separate "Testing guides" section

See merge request gitlab-org/gitlab-ee!3123
```
  ba5407bf
- Merge branch 'remove-duplicated-style' into 'master' · 60f82e74
  Robert Speicher authored Oct 12, 2017
```
Remove duplicated style

See merge request gitlab-org/gitlab-ee!3118
```
  60f82e74
- Merge branch 'ee-39028-repo-by-url-fields' into 'master' · b9bb58f4
  Tim Zallmann authored Oct 12, 2017
```
Port of 39028-repo-by-url-fields to EE

See merge request gitlab-org/gitlab-ee!3125
```
  b9bb58f4
- Merge branch '3691-geo-file-backfill' into 'master' · 439f8196
  Douwe Maan authored Oct 12, 2017
```
Prevent failed file syncs from stalling Geo backfill

Closes #3691

See merge request gitlab-org/gitlab-ee!3101
```
  439f8196
- Fix RuboCop offense · 0e2886c3
  Rémy Coutable authored Oct 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0e2886c3
- Fix spec/presenters/merge_request_presenter_spec.rb · 66812f9b
  Rémy Coutable authored Oct 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  66812f9b
- Fix spec/helpers/groups_helper_spec.rb · 76e67b2d
  Rémy Coutable authored Oct 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  76e67b2d
11 Oct, 2017 15 commits
- Merge branch 'ee-38871-cleanup-data-page-attribute-after-karma-test' into 'master' · 42dfbd02
  Clement Ho authored Oct 11, 2017
```
Cleanup data-page attribute after each Karma test -- EE merge edition

Closes gitlab-ce#38871

See merge request gitlab-org/gitlab-ee!3115
```
  42dfbd02
- Port of 39028-repo-by-url-fields to EE · 92feddb4
  Annabel Dunstone Gray authored Oct 11, 2017
  
  92feddb4
- Fix conflicts for: · 25dd237b
  Filipa Lacerda authored Oct 11, 2017
```
  -  app/assets/javascripts/label_manager.js
  - app/assets/javascripts/main.js
  - app/assets/javascripts/star.js
```
  25dd237b
- Merge branch 'ee-37399-simplify-project-page' into 'master' · d4e5ce17
  Annabel Dunstone Gray authored Oct 11, 2017
```
Simplify project page- EE version

See merge request gitlab-org/gitlab-ee!3093
```
  d4e5ce17
- Merge branch 'remove-duplicated-test' into 'master' · e2c5c18e
  Sean McGivern authored Oct 11, 2017
```
Remove duplicated test

See merge request gitlab-org/gitlab-ee!3120
```
  e2c5c18e
- Cleanup data-page attribute after each Karma test · 2514ce67
  Eric Eastwood authored Oct 06, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871

Conflicts:
	app/assets/javascripts/milestone_select.js
```
  2514ce67
- Fix a missing link and create a separate "Testing guides" section · bfe0e2df
  Rémy Coutable authored Oct 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bfe0e2df
- Include attachment and LFS object sync failures in Geo node status · 39a44e03
  Nick Thomas authored Oct 10, 2017
  
  39a44e03
- Prevent failed file syncs from stalling Geo backfill · 98f55734
  Nick Thomas authored Oct 09, 2017
  
  98f55734
- Add a changelog item · 9ac31d3b
  Valery Sizov authored Oct 06, 2017
  
  9ac31d3b
- Resolve project_members conflicts · 1f466ce3
  Annabel Dunstone Gray authored Oct 11, 2017
  
  1f466ce3
- Merge branch 'docs-image-commenting' into 'master' · 2d829861
  Achilleas Pipinellis authored Oct 11, 2017
```
Add ee version of image commenting docs

See merge request gitlab-org/gitlab-ee!3119
```
  2d829861
- Resolve conflict in doc/user/permissions.md · 2ccf026b
  Rémy Coutable authored Oct 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2ccf026b
- Resolve conflict in app/controllers/projects_controller.rb · 86ba6492
  Rémy Coutable authored Oct 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  86ba6492
- Resolve conflicts in development documentation · 9a0eda66
  Rémy Coutable authored Oct 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9a0eda66