CE upstream

Restored source branch ce_upstream

@winniehell @fatihacet @alfredo1 Sorry gays for mentioning all of you but you are all involved to these conflicts. Please check If I merged it correctly. Also the last file in this diff looks weird because in EE we are using 'global object' in CE we are not. Could we be consistent on this? Please push all changes to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/832/

looking

nvm @iamphill already fixed it. Thanks!

Mentioned in commit afa7c81f

@iamphill Please resolve app/assets/stylesheets/pages/boards.scss :)

Added 1 commit:

• aa548f05 - Resolved boards.scss conflict

Compare with previous version

@vsizov Resolved. Couldn't double check I did it correctly because of other conflicts so i'll double check once merged.

@iamphill Thanks. This is also yours app/views/projects/boards/index.html.haml, app/views/projects/boards/show.html.haml :)

@dzaporozhets Please resolve this config/routes/group.rb

Added 2 commits:

• 0c08832b - resolve more conflicts
• f62e396e - Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

Compare with previous version

@vsizov done.

Added 1 commit:

• c863fcbc - Resolve conflict in config/routes/group.rb

Compare with previous version

@vsizov Resolved

Added 1 commit:

• e69c4c87 - fix scss lint

Compare with previous version

Added 2 commits:

• e9f0158f - Resolved issue boards conflicts
• e5396b8e - Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

Compare with previous version

Thanks @iamphill

Added 1 commit:

• 39c7a270 - Fixed JS lint errors

Compare with previous version

Enabled an automatic merge when the build for a0650619 succeeds

Added 2 commits:

• b50d5198 - fix spec/requests/api/deploy_keys_spec.rb after ce->ee
• a0650619 - Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

Compare with previous version

Status changed to merged

Mentioned in commit 8d86a1cd

mentioned in commit maxraab/gitlab-ce@15d7432c