CE upstream - Wednesday
Files to resolve:
-
@jacobvosmaer-gitlab Please resolve (UU) Gemfile.lock
-
@filipa Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@lbennett Please resolve (UU) app/assets/stylesheets/framework/dropdowns.scss
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) app/assets/stylesheets/pages/issues.scss
-
@annabeldunstone Please resolve (UU) app/assets/stylesheets/pages/projects.scss
-
Markus Koller Please resolve (UU) app/helpers/appearances_helper.rb
-
@ayufan Please resolve (UU) app/models/ci/build.rb
-
@felipe_artur Please resolve (UU) app/services/boards/issues/list_service.rb
-
@ayufan Please resolve (AA) app/uploaders/job_artifact_uploader.rb
-
@ayufan Please resolve (AA) app/uploaders/legacy_artifact_uploader.rb
-
@DouweM Please resolve (UU) app/workers/post_receive.rb
-
@DouweM Please resolve (UU) app/workers/project_cache_worker.rb
-
@marcia Please resolve (UU) doc/user/permissions.md
-
Paul Please resolve (UU) doc/user/project/merge_requests/index.md
-
@DouweM Please resolve (AA) lib/gitlab/sidekiq_config.rb
-
@bikebilly Please resolve (UU) locale/gitlab.pot
-
Markus Koller Please resolve (UU) spec/factories/appearances.rb
-
@ayufan Please resolve (AA) spec/factories/ci/job_artifacts.rb
-
@rymai Please resolve (AA) spec/lib/gitlab/email/handler_spec.rb
-
@DouweM Please resolve (AA) spec/lib/gitlab/sidekiq_config_spec.rb
-
@reprazent Please resolve (UU) spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
-
@ayufan Please resolve (UU) spec/models/ci/build_spec.rb
-
Francisco Javier López Please resolve (UU) spec/models/project_spec.rb
-
Zeger-Jan van de Weg Please resolve (UU) spec/serializers/pipeline_serializer_spec.rb
-
@ayufan Please resolve (AA) spec/uploaders/job_artifact_uploader_spec.rb
-
@ayufan Please resolve (AA) spec/uploaders/legacy_artifact_uploader_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-12-06
branch.
Thanks in advance!
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Rémy Coutable