zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 01:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry

Browse source 
Conflicts:
	app/views/admin/bank_statements/index.haml
	config/locales/en.yml
This commit is contained in:
Martin Lensment 2015-04-16 18:06:08 +03:00
commit c74ed91377
94 changed files with 686 additions and 651 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/epp_logs_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::EppLogsController < ApplicationController
class Admin::EppLogsController < AdminController
load_and_authorize_resource class: ApiLog::EppLog
def index

2
app/controllers/admin/repp_logs_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::ReppLogsController < ApplicationController
class Admin::ReppLogsController < AdminController
load_and_authorize_resource class: ApiLog::ReppLog
def index

2
app/controllers/admin/sessions_controller.rb
View file

@ -1,5 +1,5 @@
class Admin::SessionsController < SessionsController
layout 'login'
layout 'admin/application'
def create
super

2
app/controllers/admin/zonefile_settings_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::ZonefileSettingsController < ApplicationController
class Admin::ZonefileSettingsController < AdminController
load_and_authorize_resource
before_action :set_zonefile_setting, only: [:update, :edit]
def index