Merge remote-tracking branch 'upstream/master'

CHANGELOG

Gemfile

Gemfile.lock

app/assets/stylesheets/base/layout.scss

app/assets/stylesheets/generic/buttons.scss

app/assets/stylesheets/generic/sidebar.scss

app/assets/stylesheets/pages/projects.scss

app/controllers/dashboard/projects_controller.rb

app/controllers/passwords_controller.rb

app/controllers/projects/services_controller.rb

app/helpers/projects_helper.rb

app/models/project.rb

app/models/project_services/gitlab_ci_service.rb

app/models/project_team.rb

app/models/user.rb

app/services/ci/create_project_service.rb

app/services/git_push_service.rb

app/services/projects/fork_service.rb

app/views/dashboard/projects/starred.html.haml

app/views/devise/passwords/new.html.haml