Merge branch 'artifacts-from-ref-and-build-name-api' into artifacts-from-ref-and-build-name

* artifacts-from-ref-and-build-name-api: (384 commits)
  Add API documentation for downloading the latest successful build
  Since it's too hard to use JOIN with Rails... feedback:
  Workaround MySQL with INNER JOIN:
  Just put setup directly in the test, feedback:
  Cleanup the use of let, feedback:
  Lose unneeded instance variables and variables, feedback:
  Add link to user profile to commit avatar (!5163)
  It's not longer than 80 chars
  Make sure there's a build
  Use the same logic, it should specify that it's not logged in
  Use 'when logging as guest' for context, feedback:
  Cleanup that a bit
  Refactor service settings view
  Fix a problem with processing a pipeline where stage only has manual actions
  Rename user2 to reporter_user
  Should check against `authorize_read_builds!`
  A CHANGELOG entry
  Don't show other actions of the same name
  Use limit parameter rather than hardcoded value
  Reuse those two methods
  ...

1 files changed, 9 insertions, 5 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 97c1e8d2154..ccc50f5cd08 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,11 +89,10 @@ Rails.application.routes.draw do
   mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\/(info\/lfs|gitlab-lfs)/.match(request.path_info) }, via: [:get, :post, :put]
 
   # Help
-  
-  get 'help'                  => 'help#index'
-  get 'help/*path'            => 'help#show', as: :help_page
-  get 'help/shortcuts'
-  get 'help/ui' => 'help#ui'
+  get 'help'           => 'help#index'
+  get 'help/shortcuts' => 'help#shortcuts'
+  get 'help/ui'        => 'help#ui'
+  get 'help/*path'     => 'help#show', as: :help_page
 
   #
   # Global snippets
@@ -733,6 +732,10 @@ Rails.application.routes.draw do
         resources :triggers, only: [:index, :create, :destroy]
 
         resources :pipelines, only: [:index, :new, :create, :show] do
+          collection do
+            resource :pipelines_settings, path: 'settings', only: [:show, :update]
+          end
+
           member do
             post :cancel
             post :retry
@@ -758,6 +761,7 @@ Rails.application.routes.draw do
             get :status
             post :cancel
             post :retry
+            post :play
             post :erase
             get :trace
             get :raw