CE upstream - Saturday
Files to resolve:
-
Lin Jen-Shin Please resolve (UU) .rubocop.yml
-
Lin Jen-Shin Please resolve (UU) app/controllers/concerns/service_params.rb
-
@rymai Please resolve (UU) config/application.rb
-
Michael Lihs Please resolve (UU) doc/api/groups.md
-
Lin Jen-Shin Please resolve (UU) lib/api/helpers.rb
-
Lin Jen-Shin Please resolve (UU) lib/extracts_path.rb
-
Nick Thomas Please resolve (UU) lib/gitlab/shell.rb
-
Lin Jen-Shin Please resolve (UU) lib/gitlab/slash_commands/presenters/issue_base.rb
-
Nick Thomas Please resolve (UU) spec/lib/gitlab/shell_spec.rb
-
@smcgivern Please resolve (UU) spec/support/stub_configuration.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-12-16
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 Nick Thomas