Merge from master(Fix conflicts)

GITLAB_PAGES_VERSION

VERSION

app/assets/javascripts/dispatcher.js

app/assets/stylesheets/pages/merge_requests.scss

app/controllers/groups/settings/ci_cd_controller.rb

app/controllers/groups/variables_controller.rb

app/controllers/projects/settings/ci_cd_controller.rb

app/controllers/projects/variables_controller.rb

app/models/blob_viewer/readme.rb

app/models/ci/build.rb

app/models/ci/group_variable.rb

app/models/ci/variable.rb

app/models/concerns/sha_attribute.rb

app/models/group.rb

app/models/project_wiki.rb

app/policies/group_policy.rb

app/presenters/ci/group_variable_presenter.rb

app/presenters/ci/variable_presenter.rb

app/views/ci/variables/_content.html.haml

app/views/ci/variables/_form.html.haml