diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-11-01 00:08:11 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-11-01 00:08:11 +0300 |
commit | 1cf167fc3e61c6c78e3bf2ba15a02f7ab317294c (patch) | |
tree | 05fda8866fb5634be495b526d06f00f02b18ea35 /config | |
parent | c73c1a20e3c5a66a71758c4809faf2f69df25392 (diff) | |
parent | 0134079430f0179c527d388539c0986352bca9bd (diff) |
Merge branch 'master' into sh-headless-chrome-support
* master: (84 commits)
Migrate Gitlab::Git::Wiki#page to Gitaly
Load participants async
Normalize LDAP DN when looking up identity
Improve the maintenance policy page
add changelog
fix spec failure
Allow promoting project milestones to group milestones
fix specs
Be able to bundle gems with newer rubies
Upgrade Ruby to 2.3.5
fixed up upload feature after master merge
fix missing issue assignees
Migrate Gitlab::Git::Wiki#delete_page to Gitaly
Enable eslint
Make `#hashed_storage?` require feature argument
Adds callback function to inital cluster request
Fix example typo.
Upload files through the multi-file editor
get branch name from the DOM
Resolve "Convert autosize.js library to be a Yarn managed library"
...
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/ci.rb | 2 | ||||
-rw-r--r-- | config/routes/project.rb | 3 | ||||
-rw-r--r-- | config/routes/snippets.rb | 2 | ||||
-rw-r--r-- | config/routes/user.rb | 12 |
4 files changed, 10 insertions, 9 deletions
diff --git a/config/routes/ci.rb b/config/routes/ci.rb index cbd4c2db852..60c1724bc05 100644 --- a/config/routes/ci.rb +++ b/config/routes/ci.rb @@ -1,5 +1,5 @@ namespace :ci do resource :lint, only: [:show, :create] - root to: redirect('/') + root to: redirect('') end diff --git a/config/routes/project.rb b/config/routes/project.rb index d05fe11f233..746c0c46677 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -293,6 +293,7 @@ constraints(ProjectUrlConstrainer.new) do resources :milestones, constraints: { id: /\d+/ } do member do + post :promote put :sort_issues put :sort_merge_requests get :merge_requests @@ -393,7 +394,7 @@ constraints(ProjectUrlConstrainer.new) do end end namespace :settings do - get :members, to: redirect('/%{namespace_id}/%{project_id}/project_members') + get :members, to: redirect("%{namespace_id}/%{project_id}/project_members") resource :ci_cd, only: [:show], controller: 'ci_cd' resource :integrations, only: [:show] resource :repository, only: [:show], controller: :repository diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb index 0a4ebac3ca3..81bc890d86b 100644 --- a/config/routes/snippets.rb +++ b/config/routes/snippets.rb @@ -17,5 +17,5 @@ resources :snippets, concerns: :awardable do end end -get '/s/:username', to: redirect('/u/%{username}/snippets'), +get '/s/:username', to: redirect('u/%{username}/snippets'), constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } diff --git a/config/routes/user.rb b/config/routes/user.rb index e682dcd6663..733a3f6ce9a 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -22,17 +22,17 @@ scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) d get :contributed, as: :contributed_projects get :snippets get :exists - get '/', to: redirect('/%{username}'), as: nil + get '/', to: redirect('%{username}'), as: nil end # Compatibility with old routing # TODO (dzaporozhets): remove in 10.0 - get '/u/:username', to: redirect('/%{username}') + get '/u/:username', to: redirect('%{username}') # TODO (dzaporozhets): remove in 9.0 - get '/u/:username/groups', to: redirect('/users/%{username}/groups') - get '/u/:username/projects', to: redirect('/users/%{username}/projects') - get '/u/:username/snippets', to: redirect('/users/%{username}/snippets') - get '/u/:username/contributed', to: redirect('/users/%{username}/contributed') + get '/u/:username/groups', to: redirect('users/%{username}/groups') + get '/u/:username/projects', to: redirect('users/%{username}/projects') + get '/u/:username/snippets', to: redirect('users/%{username}/snippets') + get '/u/:username/contributed', to: redirect('users/%{username}/contributed') end constraints(UserUrlConstrainer.new) do |