Merge branch 'master' into 13948-access-request-to-projects-and-groups

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/ci/build.coffee

app/controllers/projects/artifacts_controller.rb

app/helpers/time_helper.rb

app/models/ci/build.rb

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

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

app/views/projects/builds/_sidebar.html.haml

app/workers/expire_build_artifacts_worker.rb

config/gitlab.yml.example

config/initializers/1_settings.rb

config/initializers/chronic_duration.rb

config/routes.rb

...grate/20160416182152_convert_award_note_to_emoji_award.rb

db/migrate/20160416190505_remove_note_is_award.rb

.../20160518200441_add_artifacts_expire_date_to_ci_builds.rb

db/schema.rb

doc/api/README.md