Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

app/controllers/ci/variables_controller.rb

app/controllers/projects/application_controller.rb

app/controllers/projects/runners_controller.rb

app/controllers/projects/variables_controller.rb

app/helpers/auth_helper.rb

app/views/layouts/ci/_nav_project.html.haml

app/views/layouts/nav/_project_settings.html.haml

app/views/projects/variables/show.html.haml

config/routes.rb

spec/features/variables_spec.rb