Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/api.js.coffee

app/assets/javascripts/application.js.coffee

app/assets/javascripts/blob/blob_ci_yaml.js.coffee

app/assets/javascripts/blob/edit_blob.js.coffee

app/assets/javascripts/gl_dropdown.js.coffee

app/assets/javascripts/gl_form.js.coffee

...avascripts/graphs/stat_graph_contributors_graph.js.coffee

app/assets/javascripts/lib/text_utility.js.coffee

app/assets/javascripts/notes.js.coffee

app/assets/javascripts/notifications_dropdown.js.coffee

app/assets/javascripts/project.js.coffee

app/assets/stylesheets/framework.scss

app/assets/stylesheets/framework/blank.scss

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/dropdowns.scss

app/assets/stylesheets/framework/markdown_area.scss

app/assets/stylesheets/framework/mixins.scss