BigMac:sample_app munim$ git add -A BigMac:sample_app munim$ git commit -m "Finish user signup" [sign-up 385c6dd] Finish user signup 3 files changed, 6 insertions(+), 1 deletion(-) BigMac:sample_app munim$ git checkout master Switched to branch 'master' Your branch is up-to-date with 'origin/master'. BigMac:sample_app munim$ git merge sign-up Updating 6575ce0..385c6dd Fast-forward Gemfile.lock | 2 +- app/assets/stylesheets/custom.scss | 81 +++++++++++++++++++++++++++++++ app/controllers/users_controller.rb | 25 +++++++++- app/helpers/users_helper.rb | 7 +++ app/views/layouts/application.html.erb | 4 ++ app/views/shared/_error_messages.html.erb | 12 +++++ app/views/users/new.html.erb | 23 ++++++++- app/views/users/newrail.html.erb | 2 - app/views/users/show.html.erb | 11 +++++ config/routes.rb | 5 +- test/integration/users_signup_test.rb | 16 ++++++ 11 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 app/views/shared/_error_messages.html.erb delete mode 100644 app/views/users/newrail.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 test/integration/users_signup_test.rb |
Blog >