fixes conflicts with master

2015-10-14 15:48:55 +02:00
parent 68b866171b 77bacdc3ec
commit e08ed41e98
63 changed files with 1394 additions and 1677 deletions
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -135,7 +135,7 @@ module CommonActions
    fill_in 'sms_phone', with: "611111111"
    click_button 'Send'

-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'

    user = User.last.reload
    fill_in 'sms_confirmation_code', with: user.sms_confirmation_code