CE upstream - Thursday
Files to resolve:
-
@mikegreiling Please resolve (UU) app/assets/javascripts/main.js
-
Jose Ivan Vargas Please resolve (UU) app/assets/javascripts/project.js
-
@iamphill Please resolve (AA) app/assets/javascripts/repo/lib/editor_options.js
-
Jose Ivan Vargas Please resolve (UU) app/helpers/button_helper.rb
-
@dosuken123 Please resolve (UU) app/models/environment.rb
-
@iamphill Please resolve (AA) spec/javascripts/repo/lib/editor_options_spec.js
-
@iamphill Please resolve (AA) spec/javascripts/repo/lib/editor_spec.js
-
@DouweM Please resolve (UU) spec/models/project_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-11-30
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