diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-04 11:26:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-04 11:26:20 +0000 |
| commit | fbae59cd5559879f910f2046835b61bec2f42a69 (patch) | |
| tree | 5126461937a4403b0faa036483e6dcd2246cc936 /app/views | |
| parent | 1de019f5c8a76da10877b8a2b4f27823374c6da2 (diff) | |
| parent | 602fe111912bac119e752b0dfa3b4b3cd81585ff (diff) | |
| download | gitlab-ce-fbae59cd5559879f910f2046835b61bec2f42a69.tar.gz | |
Merge branch 'devise-deprecations' into 'master'
Fix Devise deprecation warnings by updating omniauth provider paths to
use the new Devise/Rails 5 format.
See merge request !5331
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/devise/sessions/_new_crowd.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/devise/sessions/_new_crowd.html.haml b/app/views/devise/sessions/_new_crowd.html.haml index 8e81671b7e7..b7d3acac2b1 100644 --- a/app/views/devise/sessions/_new_crowd.html.haml +++ b/app/views/devise/sessions/_new_crowd.html.haml @@ -1,4 +1,4 @@ -= form_tag(user_omniauth_authorize_path("crowd"), id: 'new_crowd_user' ) do += form_tag(omniauth_authorize_path(:user, :crowd), id: 'new_crowd_user' ) do = text_field_tag :username, nil, {class: "form-control top", placeholder: "Username", autofocus: "autofocus"} = password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"} - if devise_mapping.rememberable? diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index de18bc2d844..2e7da2747d0 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -5,4 +5,4 @@ - providers.each do |provider| %span.light - has_icon = provider_has_icon?(provider) - = link_to provider_image_tag(provider), user_omniauth_authorize_path(provider), method: :post, class: (has_icon ? 'oauth-image-link' : 'btn'), "data-no-turbolink" => "true" + = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: (has_icon ? 'oauth-image-link' : 'btn'), "data-no-turbolink" => "true" diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index 57d16d29158..c80f22457b4 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -70,7 +70,7 @@ = link_to unlink_profile_account_path(provider: provider), method: :delete, class: 'provider-btn' do Disconnect - else - = link_to user_omniauth_authorize_path(provider), method: :post, class: 'provider-btn not-active', "data-no-turbolink" => "true" do + = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn not-active', "data-no-turbolink" => "true" do Connect %hr - if current_user.can_change_username? |