diff options
| -rw-r--r-- | Gemfile.lock | 14 | ||||
| -rw-r--r-- | app/controllers/users_controller.rb | 3 | ||||
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | log/.keep | 0 | ||||
| -rw-r--r-- | test/controllers/.keep | 0 | ||||
| -rw-r--r-- | test/fixtures/.keep | 0 | ||||
| -rw-r--r-- | test/helpers/.keep | 0 | ||||
| -rw-r--r-- | test/integration/.keep | 0 | ||||
| -rw-r--r-- | test/mailers/.keep | 0 | ||||
| -rw-r--r-- | test/models/.keep | 0 | ||||
| -rw-r--r-- | test/test_helper.rb | 15 |
11 files changed, 16 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b47c41e..9de990e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,11 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) +<<<<<<< HEAD + atomic (1.1.15) +======= atomic (1.1.14) +>>>>>>> 699bd065c06689a159c11ac3aacef6b34001617c bcrypt-ruby (3.1.2) bootstrap-sass (3.1.1.0) sass (~> 3.2) @@ -115,7 +119,11 @@ GEM multi_json (~> 1.0) rubyzip (< 1.0.0) websocket (~> 1.0.4) +<<<<<<< HEAD + sprockets (2.11.0) +======= sprockets (2.10.1) +>>>>>>> 699bd065c06689a159c11ac3aacef6b34001617c hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -124,13 +132,13 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.8) + sqlite3 (1.3.9) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.18.1) - thread_safe (0.1.3) - atomic + thread_safe (0.2.0) + atomic (>= 1.1.7, < 2) tilt (1.4.1) treetop (1.4.15) polyglot diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ebcc3ac..f4e1499 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,4 +3,7 @@ class UsersController < ApplicationController def new end + def show + @user = User.find(param[:id]) + end end diff --git a/config/application.rb b/config/application.rb index bf581b8..57c9163 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,6 +12,8 @@ module Leaguer # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. + I18n.enforce_available_locales = true + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' diff --git a/log/.keep b/log/.keep deleted file mode 100644 index e69de29..0000000 --- a/log/.keep +++ /dev/null diff --git a/test/controllers/.keep b/test/controllers/.keep deleted file mode 100644 index e69de29..0000000 --- a/test/controllers/.keep +++ /dev/null diff --git a/test/fixtures/.keep b/test/fixtures/.keep deleted file mode 100644 index e69de29..0000000 --- a/test/fixtures/.keep +++ /dev/null diff --git a/test/helpers/.keep b/test/helpers/.keep deleted file mode 100644 index e69de29..0000000 --- a/test/helpers/.keep +++ /dev/null diff --git a/test/integration/.keep b/test/integration/.keep deleted file mode 100644 index e69de29..0000000 --- a/test/integration/.keep +++ /dev/null diff --git a/test/mailers/.keep b/test/mailers/.keep deleted file mode 100644 index e69de29..0000000 --- a/test/mailers/.keep +++ /dev/null diff --git a/test/models/.keep b/test/models/.keep deleted file mode 100644 index e69de29..0000000 --- a/test/models/.keep +++ /dev/null diff --git a/test/test_helper.rb b/test/test_helper.rb deleted file mode 100644 index bc7e05d..0000000 --- a/test/test_helper.rb +++ /dev/null @@ -1,15 +0,0 @@ -ENV["RAILS_ENV"] ||= "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - ActiveRecord::Migration.check_pending! - - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... -end |