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

Conflicts:
	db/schema.rb
This commit is contained in:
Martin Lensment 2015-04-15 11:33:20 +03:00
commit 629f125ba6
4 changed files with 4 additions and 4 deletions

View file

@ -4,7 +4,7 @@ module Legacy
begin
establish_connection :fred
rescue ActiveRecord::AdapterNotSpecified => e
logger.info "'fred' database not configured, please update your database.yml file: #{e}"
logger.info "Legacy 'fred' database support is currently disabled because #{e}"
end
def readonly?

View file

@ -17,6 +17,6 @@
.row
.col-md-12.text-right
= button_tag(t('save'), class: 'btn btn-primary')
= button_tag(t(:add), class: 'btn btn-primary')

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150415075408) do
ActiveRecord::Schema.define(version: 20150414151357) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"

View file

@ -21,7 +21,7 @@ feature 'Invoices', type: :feature do
it 'should navigate to the domains index page' do
current_path.should == '/registrar'
click_link 'Accounting'
click_link 'Billing'
current_path.should == '/registrar/invoices'
page.should have_text('Your current credit account balance is')