CE upstream - 2018-02-07 20:29 UTC
Files to resolve:
-
@kushalpandya Please resolve (UU) app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
-
@kushalpandya Please resolve (UU) app/assets/javascripts/filtered_search/filtered_search_manager.js
-
@kushalpandya Please resolve (UU) app/assets/javascripts/pages/groups/issues/index.js
-
@kushalpandya Please resolve (UU) app/assets/javascripts/pages/projects/issues/index/index.js
-
@kushalpandya Please resolve (UU) app/assets/javascripts/pages/search/init_filtered_search.js
-
@matteeyah Please resolve (UU) app/controllers/projects/variables_controller.rb
-
@mayra-cabrera Please resolve (UU) app/models/ci/pipeline.rb
-
@matteeyah Please resolve (UU) app/models/ci/runner.rb
-
@matteeyah Please resolve (UU) app/models/group.rb
-
@matteeyah Please resolve (AA) app/serializers/variable_entity.rb
-
@rdavila Please resolve (AA) app/services/lfs/lock_file_service.rb
-
@rdavila Please resolve (AA) app/services/lfs/unlock_file_service.rb
-
@matteeyah Please resolve (UU) config/routes/project.rb
-
@dbalexandre Please resolve (UU) db/schema.rb
-
@axil Please resolve (UU) doc/administration/job_artifacts.md
-
@jarka Please resolve (AA) doc/api/search.md
-
@axil Please resolve (UU) doc/ci/examples/browser_performance.md
-
@marcia Please resolve (UU) doc/ci/variables/README.md
-
@axil Please resolve (UU) doc/topics/autodevops/index.md
-
@axil Please resolve (UU) doc/user/group/index.md
-
@axil Please resolve (UU) doc/user/permissions.md
-
@mayra-cabrera Please resolve (UU) doc/user/project/index.md
-
@axil Please resolve (UU) doc/user/project/issue_board.md
-
@axil Please resolve (UU) doc/user/project/issues/index.md
-
@axil Please resolve (UU) doc/user/project/merge_requests/index.md
-
@jarka Please resolve (AA) lib/api/search.rb
-
Jarka Kadlecová Please resolve (UU) locale/gitlab.pot
-
@kushalpandya Please resolve (UU) spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
-
@MadLittleMods Please resolve (UU) spec/javascripts/fixtures/projects.rb
-
@rdavila Please resolve (UU) spec/lib/gitlab/import_export/all_models.yml
-
@mdelaossa Please resolve (AA) spec/requests/api/search_spec.rb
-
@rdavila Please resolve (AA) spec/services/lfs/lock_file_service_spec.rb
-
@rdavila Please resolve (AA) spec/services/lfs/unlock_file_service_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-07
branch.
Thanks in advance!
@axil After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
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 Ian Baum