Commits · 5dbecb8e262f3745e37fc89ceeeb8e54178cefb0 · nexedi / gitlab-ce

11 Dec, 2017 2 commits
- Fix a wrong conflict resolution in spec/models/ci/build_spec.rb · 5dbecb8e
  Rémy Coutable authored Dec 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5dbecb8e
- Remove duplicate 'artifacts' section in config/gitlab.yml.example · 477e570b
  Rémy Coutable authored Dec 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  477e570b
10 Dec, 2017 1 commit
- Fix user_creates_merge_request_spec.rb · c3cae0ee
  Luke Bennett authored Dec 10, 2017
  
  c3cae0ee
07 Dec, 2017 3 commits
- Fix locale/gitlab.pot · 0077f212
  Rémy Coutable authored Dec 07, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0077f212
- Re-add `file_store` to db/schema.rb · 63d2a03c
  Rémy Coutable authored Dec 07, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  63d2a03c
- Remove duplicate table from db/schema.rb · 26033f33
  Rémy Coutable authored Dec 07, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  26033f33
06 Dec, 2017 34 commits
- Resolve conflict in spec/factories/ci/job_artifacts.rb · 11d945f4
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  11d945f4
- Resolve conflict in app/uploaders/job_artifact_uploader.rb · c479a467
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c479a467
- Resolve conflict in app/assets/stylesheets/pages/issues.scss · 983d0b2f
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  983d0b2f
- Resolve conflict in app/assets/stylesheets/framework/dropdowns.scss · 5a8e8382
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5a8e8382
- Resolve conflict in app/uploaders/legacy_artifact_uploader.rb · f8e93cbb
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f8e93cbb
- Resolve conflict in spec/uploaders/legacy_artifact_uploader_spec.rb · c58b661f
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c58b661f
- Resolve conflict in spec/lib/gitlab/email/handler_spec.rb · e11a793f
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e11a793f
- Resolve conflict in spec/uploaders/job_artifact_uploader_spec.rb · c46ddd45
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c46ddd45
- Resolve conflict in spec/serializers/pipeline_serializer_spec.rb · d125a9d0
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d125a9d0
- Resolve conflict in spec/models/project_spec.rb · 2112c323
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2112c323
- Resolve conflict in spec/models/ci/build_spec.rb · c3c2d3e6
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c3c2d3e6
- Resolve conflict in doc/user/project/merge_requests/index.md · 93d3de9a
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  93d3de9a
- Resolve conflict in app/helpers/appearances_helper.rb · 8b120a34
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8b120a34
- Resolve conflict in spec/factories/appearances.rb · fc31da4c
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fc31da4c
- Resolve conflict in app/models/ci/build.rb · b831b6de
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b831b6de
- Resolve conflict in Gemfile.lock · 37de1836
  Rémy Coutable authored Dec 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  37de1836
- Fix conflicts in projects.scss · 6647b9f5
  Annabel Dunstone Gray authored Dec 06, 2017
  
  6647b9f5
- fix conflict on user/permissions.md · ee2759e0
  Marcia Ramos authored Dec 06, 2017
  
  ee2759e0
- Fix conflict in app/assets/javascripts/dispatcher.js · 84359ec0
  Filipa Lacerda authored Dec 06, 2017
  
  84359ec0
- Resolve conflict in sidekiq_config_spec.rb · ad5c194c
  Douwe Maan authored Dec 06, 2017
  
  ad5c194c
- Resolve conflict in sidekiq_config.rb · 620738be
  Douwe Maan authored Dec 06, 2017
  
  620738be
- Resolve conflict in project_cache_worker.rb · 587df766
  Douwe Maan authored Dec 06, 2017
  
  587df766
- Resolve conflict in post_receive.rb · 8d0471c6
  Douwe Maan authored Dec 06, 2017
  
  8d0471c6
- fix app/services/boards/issues/list_service.rb conflifct · 8cd21552
  Felipe Artur authored Dec 06, 2017
  
  8cd21552
- Resolve `migrate_gcp_clusters_to_new_clusters_architectures_spec.rb` · e61fee3b
  Bob Van Landuyt authored Dec 06, 2017
```
[skip-ci]
```
  e61fee3b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-06 · 042330c7
  GitLab Bot authored Dec 06, 2017
```
# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/dispatcher.js
#	app/assets/stylesheets/framework/dropdowns.scss
#	app/assets/stylesheets/pages/issues.scss
#	app/assets/stylesheets/pages/projects.scss
#	app/helpers/appearances_helper.rb
#	app/models/ci/build.rb
#	app/services/boards/issues/list_service.rb
#	app/uploaders/job_artifact_uploader.rb
#	app/uploaders/legacy_artifact_uploader.rb
#	app/workers/post_receive.rb
#	app/workers/project_cache_worker.rb
#	doc/user/permissions.md
#	doc/user/project/merge_requests/index.md
#	lib/gitlab/sidekiq_config.rb
#	locale/gitlab.pot
#	spec/factories/appearances.rb
#	spec/factories/ci/job_artifacts.rb
#	spec/lib/gitlab/email/handler_spec.rb
#	spec/lib/gitlab/sidekiq_config_spec.rb
#	spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
#	spec/models/ci/build_spec.rb
#	spec/models/project_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb
#	spec/uploaders/legacy_artifact_uploader_spec.rb

[ci skip]
```
  042330c7
- Merge branch 'ee-backport-issue_40654' into 'master' · 68360783
  Sean McGivern authored Dec 06, 2017
```
[CE-Backport] Fix board filter when milestone is predefined

See merge request gitlab-org/gitlab-ce!15750
```
  68360783
- Merge branch 'ee-downgrade-grpc-to-1.4.5' into 'master' · 309a5f15
  Sean McGivern authored Dec 06, 2017
```
Downgrade the grpc gem to 1.4.5

See merge request gitlab-org/gitlab-ee!3642
```
  309a5f15
- Merge branch 'downgrade-grpc-to-1.4.5' into 'master' · eb367297
  Sean McGivern authored Dec 06, 2017
```
Downgrade the grpc gem to 1.4.5

See merge request gitlab-org/gitlab-ce!15746
```
  eb367297
- Merge branch 'gitaly-worktree-refactor' into 'master' · bb6767e5
  Sean McGivern authored Dec 06, 2017
```
Move git operations for squash and rebase into Gitlab::Git

Closes gitaly#761

See merge request gitlab-org/gitlab-ee!3543
```
  bb6767e5
- Merge branch 'add-board-scope-highlight' into 'master' · f6793a80
  Sean McGivern authored Dec 06, 2017
```
Add board scope highlight

Closes #4067

See merge request gitlab-org/gitlab-ee!3499
```
  f6793a80
- Add board scope highlight · b9dea9ca
  Clement Ho authored Dec 06, 2017
  
  b9dea9ca
- Merge branch 'backport-board-scope-highlight' into 'master' · 0803a0b3
  Sean McGivern authored Dec 06, 2017
```
Backport board scope highlight

See merge request gitlab-org/gitlab-ce!15757
```
  0803a0b3
- Merge branch 'ce-to-ee-2017-12-05' into 'master' · c55155b3
  Valery Sizov authored Dec 06, 2017
```
CE upstream - Tuesday

Closes gitaly#737

See merge request gitlab-org/gitlab-ee!3633
```
  c55155b3