CE upstream - Friday
Files to resolve:
-
@MadLittleMods Please resolve (UU) app/assets/stylesheets/pages/projects.scss
-
@godfat Please resolve (UU) app/models/project.rb
-
@godfat Please resolve (UU) app/models/repository.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-12
branch.
Thanks in advance!
@godfat 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 Robert Speicher