Admin section capitalization fix
This commit is contained in:
parent
eb2d6a6ed5
commit
c2a987fb9c
17 changed files with 22 additions and 22 deletions
|
@ -30,5 +30,5 @@
|
||||||
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm btn-block"
|
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm btn-block"
|
||||||
- else
|
- else
|
||||||
.btn.btn-sm.disabled.btn-block
|
.btn.btn-sm.disabled.btn-block
|
||||||
Already Blocked
|
Already blocked
|
||||||
= link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr"
|
= link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr"
|
||||||
|
|
|
@ -148,7 +148,7 @@
|
||||||
Sign-in enabled
|
Sign-in enabled
|
||||||
- if omniauth_enabled? && button_based_providers.any?
|
- if omniauth_enabled? && button_based_providers.any?
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth Sign-In sources', class: 'control-label col-sm-2'
|
= f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'control-label col-sm-2'
|
||||||
.col-sm-10
|
.col-sm-10
|
||||||
.btn-group{ data: { toggle: 'buttons' } }
|
.btn-group{ data: { toggle: 'buttons' } }
|
||||||
- oauth_providers_checkboxes.each do |source|
|
- oauth_providers_checkboxes.each do |source|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
%p.light
|
%p.light
|
||||||
System OAuth applications don't belong to any user and can only be managed by admins
|
System OAuth applications don't belong to any user and can only be managed by admins
|
||||||
%hr
|
%hr
|
||||||
%p= link_to 'New Application', new_admin_application_path, class: 'btn btn-success'
|
%p= link_to 'New application', new_admin_application_path, class: 'btn btn-success'
|
||||||
%table.table.table-striped
|
%table.table.table-striped
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
= link_to admin_projects_path do
|
= link_to admin_projects_path do
|
||||||
%h1= number_with_delimiter(Project.cached_count)
|
%h1= number_with_delimiter(Project.cached_count)
|
||||||
%hr
|
%hr
|
||||||
= link_to('New Project', new_project_path, class: "btn btn-new")
|
= link_to('New project', new_project_path, class: "btn btn-new")
|
||||||
.col-sm-4
|
.col-sm-4
|
||||||
.light-well.well-centered
|
.light-well.well-centered
|
||||||
%h4 Users
|
%h4 Users
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
= link_to admin_users_path do
|
= link_to admin_users_path do
|
||||||
%h1= number_with_delimiter(User.count)
|
%h1= number_with_delimiter(User.count)
|
||||||
%hr
|
%hr
|
||||||
= link_to 'New User', new_admin_user_path, class: "btn btn-new"
|
= link_to 'New user', new_admin_user_path, class: "btn btn-new"
|
||||||
.col-sm-4
|
.col-sm-4
|
||||||
.light-well.well-centered
|
.light-well.well-centered
|
||||||
%h4 Groups
|
%h4 Groups
|
||||||
|
@ -141,7 +141,7 @@
|
||||||
= link_to admin_groups_path do
|
= link_to admin_groups_path do
|
||||||
%h1= number_with_delimiter(Group.count)
|
%h1= number_with_delimiter(Group.count)
|
||||||
%hr
|
%hr
|
||||||
= link_to 'New Group', new_admin_group_path, class: "btn btn-new"
|
= link_to 'New group', new_admin_group_path, class: "btn btn-new"
|
||||||
|
|
||||||
.row.prepend-top-10
|
.row.prepend-top-10
|
||||||
.col-md-4
|
.col-md-4
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
%h3.page-title.deploy-keys-title
|
%h3.page-title.deploy-keys-title
|
||||||
Public deploy keys (#{@deploy_keys.count})
|
Public deploy keys (#{@deploy_keys.count})
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to 'New Deploy Key', new_admin_deploy_key_path, class: 'btn btn-new btn-sm btn-inverted'
|
= link_to 'New deploy key', new_admin_deploy_key_path, class: 'btn btn-new btn-sm btn-inverted'
|
||||||
|
|
||||||
- if @deploy_keys.any?
|
- if @deploy_keys.any?
|
||||||
.table-holder.deploy-keys-list
|
.table-holder.deploy-keys-list
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
= link_to admin_groups_path(sort: sort_value_largest_group, name: project_name) do
|
= link_to admin_groups_path(sort: sort_value_largest_group, name: project_name) do
|
||||||
= sort_title_largest_group
|
= sort_title_largest_group
|
||||||
= link_to new_admin_group_path, class: "btn btn-new" do
|
= link_to new_admin_group_path, class: "btn btn-new" do
|
||||||
New Group
|
New group
|
||||||
%ul.content-list
|
%ul.content-list
|
||||||
= render @groups
|
= render @groups
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
group members
|
group members
|
||||||
%span.badge= @group.members.size
|
%span.badge= @group.members.size
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@group, :members]), class: "btn btn-xs"
|
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-xs"
|
||||||
%ul.well-list.group-users-list.content-list
|
%ul.well-list.group-users-list.content-list
|
||||||
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
|
||||||
.panel-footer
|
.panel-footer
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
= f.check_box :enable_ssl_verification
|
= f.check_box :enable_ssl_verification
|
||||||
%strong Enable SSL verification
|
%strong Enable SSL verification
|
||||||
.form-actions
|
.form-actions
|
||||||
= f.submit "Add System Hook", class: "btn btn-create"
|
= f.submit "Add system hook", class: "btn btn-create"
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
- if @hooks.any?
|
- if @hooks.any?
|
||||||
|
@ -62,7 +62,7 @@
|
||||||
- @hooks.each do |hook|
|
- @hooks.each do |hook|
|
||||||
%li
|
%li
|
||||||
.controls
|
.controls
|
||||||
= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-sm"
|
= link_to 'Test hook', admin_hook_test_path(hook), class: "btn btn-sm"
|
||||||
= link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
|
= link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
|
||||||
.monospace= hook.url
|
.monospace= hook.url
|
||||||
%div
|
%div
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- page_title "Identities", @user.name, "Users"
|
- page_title "Identities", @user.name, "Users"
|
||||||
= render 'admin/users/head'
|
= render 'admin/users/head'
|
||||||
|
|
||||||
= link_to 'New Identity', new_admin_user_identity_path, class: 'pull-right btn btn-new'
|
= link_to 'New identity', new_admin_user_identity_path, class: 'pull-right btn btn-new'
|
||||||
- if @identities.present?
|
- if @identities.present?
|
||||||
.table-holder
|
.table-holder
|
||||||
%table.table
|
%table.table
|
||||||
|
|
|
@ -159,7 +159,7 @@
|
||||||
%span.badge= @group_members.size
|
%span.badge= @group_members.size
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to admin_group_path(@group), class: 'btn btn-xs' do
|
= link_to admin_group_path(@group), class: 'btn btn-xs' do
|
||||||
= icon('pencil-square-o', text: 'Manage Access')
|
= icon('pencil-square-o', text: 'Manage access')
|
||||||
%ul.well-list.content-list
|
%ul.well-list.content-list
|
||||||
= render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
|
||||||
.panel-footer
|
.panel-footer
|
||||||
|
@ -173,7 +173,7 @@
|
||||||
project members
|
project members
|
||||||
%span.badge= @project.users.size
|
%span.badge= @project.users.size
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@project, :members]), class: "btn btn-xs"
|
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-xs"
|
||||||
%ul.well-list.project_members.content-list
|
%ul.well-list.project_members.content-list
|
||||||
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
|
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
|
||||||
.panel-footer
|
.panel-footer
|
||||||
|
|
|
@ -35,5 +35,5 @@
|
||||||
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
|
= link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
|
||||||
- else
|
- else
|
||||||
.btn.btn-xs.disabled
|
.btn.btn-xs.disabled
|
||||||
Already Blocked
|
Already blocked
|
||||||
= link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"
|
= link_to 'Remove log', [:admin, spam_log], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"
|
||||||
|
|
|
@ -37,6 +37,6 @@
|
||||||
- if user.can_be_removed? && can?(current_user, :destroy_user, @user)
|
- if user.can_be_removed? && can?(current_user, :destroy_user, @user)
|
||||||
%li.divider
|
%li.divider
|
||||||
%li
|
%li
|
||||||
= link_to 'Delete User', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Consider cancelling this deletion and blocking the user instead. Are you sure?" },
|
= link_to 'Delete user', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Consider cancelling this deletion and blocking the user instead. Are you sure?" },
|
||||||
class: 'btn btn-remove btn-block',
|
class: 'btn btn-remove btn-block',
|
||||||
method: :delete
|
method: :delete
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
= sort_title_recently_updated
|
= sort_title_recently_updated
|
||||||
= link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
|
= link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
|
||||||
= sort_title_oldest_updated
|
= sort_title_oldest_updated
|
||||||
= link_to 'New User', new_admin_user_path, class: 'btn btn-new btn-search'
|
= link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search'
|
||||||
|
|
||||||
.nav-block
|
.nav-block
|
||||||
%ul.nav-links.wide.scrolling-tabs.white.scrolling-tabs
|
%ul.nav-links.wide.scrolling-tabs.white.scrolling-tabs
|
||||||
|
|
|
@ -18,7 +18,7 @@ RSpec.describe 'admin deploy keys', type: :feature do
|
||||||
describe 'create new deploy key' do
|
describe 'create new deploy key' do
|
||||||
before do
|
before do
|
||||||
visit admin_deploy_keys_path
|
visit admin_deploy_keys_path
|
||||||
click_link 'New Deploy Key'
|
click_link 'New deploy key'
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates new deploy key' do
|
it 'creates new deploy key' do
|
||||||
|
|
|
@ -24,7 +24,7 @@ feature 'Admin Groups', feature: true do
|
||||||
it 'creates new group' do
|
it 'creates new group' do
|
||||||
visit admin_groups_path
|
visit admin_groups_path
|
||||||
|
|
||||||
click_link "New Group"
|
click_link "New group"
|
||||||
fill_in 'group_path', with: 'gitlab'
|
fill_in 'group_path', with: 'gitlab'
|
||||||
fill_in 'group_description', with: 'Group description'
|
fill_in 'group_description', with: 'Group description'
|
||||||
click_button "Create group"
|
click_button "Create group"
|
||||||
|
|
|
@ -33,7 +33,7 @@ describe "Admin::Hooks", feature: true do
|
||||||
fill_in 'hook_url', with: url
|
fill_in 'hook_url', with: url
|
||||||
check 'Enable SSL verification'
|
check 'Enable SSL verification'
|
||||||
|
|
||||||
expect { click_button 'Add System Hook' }.to change(SystemHook, :count).by(1)
|
expect { click_button 'Add system hook' }.to change(SystemHook, :count).by(1)
|
||||||
expect(page).to have_content 'SSL Verification: enabled'
|
expect(page).to have_content 'SSL Verification: enabled'
|
||||||
expect(current_path).to eq(admin_hooks_path)
|
expect(current_path).to eq(admin_hooks_path)
|
||||||
expect(page).to have_content(url)
|
expect(page).to have_content(url)
|
||||||
|
@ -44,7 +44,7 @@ describe "Admin::Hooks", feature: true do
|
||||||
before do
|
before do
|
||||||
WebMock.stub_request(:post, @system_hook.url)
|
WebMock.stub_request(:post, @system_hook.url)
|
||||||
visit admin_hooks_path
|
visit admin_hooks_path
|
||||||
click_link "Test Hook"
|
click_link "Test hook"
|
||||||
end
|
end
|
||||||
|
|
||||||
it { expect(current_path).to eq(admin_hooks_path) }
|
it { expect(current_path).to eq(admin_hooks_path) }
|
||||||
|
|
|
@ -8,7 +8,7 @@ RSpec.describe 'admin manage applications', feature: true do
|
||||||
it do
|
it do
|
||||||
visit admin_applications_path
|
visit admin_applications_path
|
||||||
|
|
||||||
click_on 'New Application'
|
click_on 'New application'
|
||||||
expect(page).to have_content('New application')
|
expect(page).to have_content('New application')
|
||||||
|
|
||||||
fill_in :doorkeeper_application_name, with: 'test'
|
fill_in :doorkeeper_application_name, with: 'test'
|
||||||
|
|
Loading…
Reference in a new issue