Commits · 99c23eeecd55a261f79bc07df27aef944c468cc1 · nexedi / gitlab-ce

08 Nov, 2017 25 commits
- Resolve conflict in spec/requests/api/groups_spec.rb · 99c23eee
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  99c23eee
- Resolve conflicts in spec/lib/gitlab/checks/change_access_spec.rb · b475d42d
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b475d42d
- Resolve conflict in lib/gitlab/metrics/transaction.rb · efe97c75
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  efe97c75
- Resolve conflicts in lib/gitlab/checks/change_access.rb · 4e40639c
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4e40639c
- Resolve conflicts in doc/api/merge_requests.md · e8ad6073
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e8ad6073
- Resolve conflicts in db/schema.rb · 10ff819a
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  10ff819a
- Resolve conflict in config/initializers/8_metrics.rb · dd3cb143
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  dd3cb143
- Resolve conflicts in app/models/repository.rb · f85c124a
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f85c124a
- Resolve conflict in app/models/merge_request.rb · dd96bc43
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  dd96bc43
- Resolve conflict in app/controllers/projects/refs_controller.rb · 1b8e68e6
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1b8e68e6
- Resolve conflict in app/controllers/projects/issues_controller.rb · 69298f86
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  69298f86
- Resolve CSS conflicts · cef3bb80
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cef3bb80
- Resolve conflict in app/assets/javascripts/milestone_select.js · fbfe8276
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fbfe8276
- Resolve conflict in app/assets/javascripts/dispatcher.js · 70cdb75d
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  70cdb75d
- Resolve conflict in app/assets/javascripts/boards/stores/boards_store.js · a92d58b2
  Rémy Coutable authored Nov 08, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a92d58b2
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-11-08 · 24eaba35
  Rémy Coutable authored Nov 08, 2017
```
# Conflicts:
#	app/assets/javascripts/boards/stores/boards_store.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/milestone_select.js
#	app/assets/javascripts/repo/components/repo_file.vue
#	app/assets/javascripts/repo/components/repo_loading_file.vue
#	app/assets/stylesheets/framework/avatar.scss
#	app/assets/stylesheets/framework/modal.scss
#	app/assets/stylesheets/pages/note_form.scss
#	app/controllers/projects/issues_controller.rb
#	app/controllers/projects/refs_controller.rb
#	app/models/merge_request.rb
#	app/models/repository.rb
#	config/initializers/8_metrics.rb
#	config/routes/group.rb
#	db/schema.rb
#	doc/api/merge_requests.md
#	lib/gitlab/checks/change_access.rb
#	lib/gitlab/metrics/transaction.rb
#	lib/gitlab/path_regex.rb
#	lib/gitlab/usage_data.rb
#	spec/lib/gitlab/checks/change_access_spec.rb
#	spec/lib/gitlab/metrics/web_transaction_spec.rb
#	spec/lib/gitlab/usage_data_spec.rb
#	spec/models/merge_request_spec.rb
#	spec/requests/api/groups_spec.rb
#	spec/routing/group_routing_spec.rb
#	spec/support/kubernetes_helpers.rb

[ci skip]
```
  24eaba35
- Merge branch 'fl-cleanup-test' into 'master' · f2f58a60
  Tim Zallmann authored Nov 08, 2017
```
Cleanup tests

See merge request gitlab-org/gitlab-ce!15261
```
  f2f58a60
- Merge branch 'tc-delete-merged-protected-tags-fix' into 'master' · ea4cf98c
  Douwe Maan authored Nov 08, 2017
```
When deleting merged branches, ignore protected tags

Closes #39732

See merge request gitlab-org/gitlab-ce!15252
```
  ea4cf98c
- Merge branch 'ce-to-ee' into 'master' · 747646b7
  Rémy Coutable authored Nov 08, 2017
```
CE Upstream - Monday

Closes gitlab-ce#39776, gitlab-ce#39771 et #3544

See merge request gitlab-org/gitlab-ee!3277
```
  747646b7
- Merge branch 'bvl-free-paths' into 'master' · de614b0e
  Douwe Maan authored Nov 08, 2017
```
Free some reserved group routes

See merge request gitlab-org/gitlab-ce!15052
```
  de614b0e
- Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master' · b1e572b3
  Stan Hu authored Nov 08, 2017
```
Make BackgroundTransaction#labels public

See merge request gitlab-org/gitlab-ce!15257
```
  b1e572b3
- Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master' · cb606c5a
  Stan Hu authored Nov 08, 2017
```
Make BackgroundTransaction#labels public

See merge request gitlab-org/gitlab-ce!15257
```
  cb606c5a
- Merge branch 'jivl-fix-karma-config-file' into 'master' · a979153b
  Mike Greiling authored Nov 08, 2017
```
fix karma config file

See merge request gitlab-org/gitlab-ce!15263
```
  a979153b
- Merge branch 'ux-guide-components-modal' into 'master' · a845cf24
  Marcia Ramos authored Nov 08, 2017
```
Modals in UX guide

See merge request gitlab-org/gitlab-ce!14886
```
  a845cf24
- Merge branch 'add-typescript' into 'master' · 2f644452
  Stan Hu authored Nov 08, 2017
```
Adds typescript support in webpack. With Mike G.

See merge request gitlab-org/gitlab-ce!15264
```
  2f644452
07 Nov, 2017 15 commits
- Merge branch 'sh-save-node-status-database' into 'master' · 9ac714cb
  Nick Thomas authored Nov 07, 2017
```
Add API support and storage for GeoNode status in the database

Closes #3867 and #3740

See merge request gitlab-org/gitlab-ee!3230
```
  9ac714cb
- Add API support and storage for GeoNode status in the database · 53a5489f
  Stan Hu authored Nov 07, 2017
  
  53a5489f
- Remove comments in JSON. · 98b6175e
  Jacob Schatz authored Nov 07, 2017
  
  98b6175e
- Add changelog · 430c42e1
  Jacob Schatz authored Nov 07, 2017
  
  430c42e1
- Adds typescript support in webpack. With Mike G. · c2555e72
  Jacob Schatz authored Nov 07, 2017
  
  c2555e72
- Merge branch 'docs-add-glcom-reg-restictions' into 'master' · ac4a976c
  Marcia Ramos authored Nov 07, 2017
```
Add note on registry restrictions on GitLab.com

See merge request gitlab-org/gitlab-ce!15174
```
  ac4a976c
- Add note on registry restrictions on GitLab.com · b67d7295
  Chenjerai Katanda authored Nov 07, 2017
  
  b67d7295
- Merge branch '37824-many-branches-lock-server' into 'master' · d9313795
  Annabel Dunstone Gray authored Nov 07, 2017
```
Project with many branches can lock server running "git branch --contains XXX"

Closes #37824

See merge request gitlab-org/gitlab-ce!14812
```
  d9313795
- fix karma config file · 4bd90ec3
  Jose Ivan Vargas authored Nov 07, 2017
  
  4bd90ec3
- Remove truncate mixin · fb41187b
  Annabel Dunstone Gray authored Nov 07, 2017
  
  fb41187b
- Update mr_widget_options_spec.js · 1aa4604f
  Filipa Lacerda authored Nov 07, 2017
  
  1aa4604f
- Change cursor to pointer on hover · a613b19b
  tauriedavis authored Nov 07, 2017
  
  a613b19b
- Simplify design for no tags, branches · 2acfb614
  tauriedavis authored Nov 07, 2017
  
  2acfb614
- Merge branch 'add-ingress-to-cluster-applications' into 'master' · 673b6be1
  Kamil Trzciński authored Nov 07, 2017
```
Add Ingress to cluster applications section

See merge request gitlab-org/gitlab-ce!15185
```
  673b6be1
- Cleanup tests · 2a6c8647
  Filipa Lacerda authored Nov 07, 2017
  
  2a6c8647