CE upstream - Saturday
Files to resolve:
-
@filipa Please resolve (UU) app/assets/images/icons.json
-
@filipa Please resolve (UU) app/assets/images/icons.svg
-
@timzallmann Please resolve (UU) app/assets/javascripts/ide/components/repo_file.vue
-
@timzallmann Please resolve (UA) app/assets/javascripts/ide/lib/editor_options.js
-
@jivanvl Please resolve (UU) app/assets/javascripts/monitoring/utils/date_time_formatters.js
-
@filipa Please resolve (UU) app/assets/stylesheets/pages/merge_requests.scss
-
@rspeicher Please resolve (UU) app/controllers/autocomplete_controller.rb
-
@dbalexandre Please resolve (UU) app/models/user.rb
-
@to1ne Please resolve (UU) app/services/search/global_service.rb
-
@timzallmann Please resolve (UU) app/views/projects/tree/_tree_content.html.haml
-
@timzallmann Please resolve (UU) app/views/projects/tree/_tree_header.html.haml
-
@timzallmann Please resolve (UU) app/views/projects/tree/show.html.haml
-
@tiagonbotelho Please resolve (UU) app/workers/repository_import_worker.rb
-
@marcia Please resolve (AA) doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
-
@marcia Please resolve (UU) doc/administration/auth/ldap.md
-
@joshlambert Please resolve (AA) doc/ci/examples/browser_performance.md
-
@marcia Please resolve (UU) doc/topics/authentication/index.md
-
John Doe Please resolve (UU) doc/user/group/index.md
-
@axil Please resolve (AU) doc/workflow/rebase_before_merge.md
-
@timzallmann Please resolve (UU) package.json
-
@timzallmann Please resolve (UU) yarn.lock
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-12-23
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 Lin Jen-Shin