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

Conflicts:
	db/schema.rb

app/models/legacy/db.rb

@@ -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?

app/views/registrar/deposits/new.haml

@@ -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')
 
 

db/schema.rb

@@ -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"

spec/features/registrar/invoices_spec.rb

@@ -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')