zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-22 10:45:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-569

Browse source 
# Conflicts:
#	app/controllers/admin/contacts_controller.rb
This commit is contained in:
Artur Beljajev 2017-09-11 17:09:58 +03:00
commit e4740f3f32
40 changed files with 1287 additions and 1236 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/features/admin/billing/prices/new_spec.rb
View file

@ -17,7 +17,7 @@ RSpec.feature 'New price in admin area', settings: false do
end
def open_list
click_link_or_button t('admin.menu.prices')
click_link_or_button t('admin.base.menu.prices')
end
def open_form

2
spec/features/admin/dns/zones/edit_spec.rb
View file

@ -16,7 +16,7 @@ RSpec.feature 'Editing zone in admin area', settings: false do
end
def open_list
click_link_or_button t('admin.menu.zones')
click_link_or_button t('admin.base.menu.zones')
end
def open_form

2
spec/features/admin/dns/zones/new_spec.rb
View file

@ -15,7 +15,7 @@ RSpec.feature 'New zone in admin area', settings: false do
end
def open_list
click_link_or_button t('admin.menu.zones')
click_link_or_button t('admin.base.menu.zones')
end
def open_form