Skip to content

Commit

Permalink
Fix assignments model, controller, tests, and views
Browse files Browse the repository at this point in the history
  • Loading branch information
Felix Tsai committed Aug 15, 2013
1 parent bf32a35 commit 0ddfe1d
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 25 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ group :development, :test do
gem 'launchy'
gem 'simplecov', :require => false
end

group :production do
gem 'rails_12factor'
end
57 changes: 32 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ GEM
annotate (2.5.0)
rake
arel (4.0.0)
atomic (1.1.10)
atomic (1.1.13)
awesome_print (1.1.0)
bcrypt-ruby (3.1.1)
bootstrap-sass (2.3.2.0)
bootstrap-sass (2.3.2.1)
sass (~> 3.2)
builder (3.1.4)
capybara (2.1.0)
Expand All @@ -56,10 +56,11 @@ GEM
execjs
coffee-script-source (1.6.3)
daemons (1.1.9)
devise (1.5.4)
devise (3.0.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
warden (~> 1.2.3)
diff-lcs (1.2.4)
erubis (2.7.0)
eventmachine (1.0.3)
Expand All @@ -72,7 +73,7 @@ GEM
railties (>= 3.0.0)
ffi (1.9.0)
formatador (0.2.4)
guard (1.8.1)
guard (1.8.2)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
Expand All @@ -93,40 +94,40 @@ GEM
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
hike (1.2.3)
i18n (0.6.4)
i18n (0.6.5)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.3)
jquery-ui-rails (4.0.4)
jquery-rails
railties (>= 3.1.0)
launchy (2.3.0)
addressable (~> 2.3)
listen (1.2.2)
listen (1.3.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.23)
method_source (0.8.2)
mime-types (1.24)
mini_portile (0.5.1)
minitest (4.7.5)
multi_json (1.7.7)
multi_json (1.7.9)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
orm_adapter (0.0.7)
pg (0.15.1)
orm_adapter (0.4.0)
pg (0.16.0)
polyglot (0.3.3)
protected_attributes (1.0.3)
activemodel (>= 4.0.0, < 5.0)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
pry-rails (0.3.1)
pry-rails (0.3.2)
pry (>= 0.9.10)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
Expand All @@ -142,35 +143,40 @@ GEM
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
rails-boilerplate (0.1.9)
rails-observers (0.1.1)
railties (~> 4.0.0.beta)
rails-observers (0.1.2)
activemodel (~> 4.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.1)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
rb-inotify (0.9.1)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.2)
rspec-expectations (2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.1)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.1)
rspec-mocks (2.14.3)
rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.2.9)
sass (3.2.10)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
Expand All @@ -181,7 +187,7 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.5)
slop (3.4.6)
spork (0.9.2)
sprockets (2.10.0)
hike (~> 1.2)
Expand All @@ -197,7 +203,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.0)
thread_safe (0.1.2)
atomic
tilt (1.4.1)
treetop (1.4.14)
Expand All @@ -207,7 +213,7 @@ GEM
uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.2)
warden (1.2.3)
rack (>= 1.0)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand Down Expand Up @@ -239,6 +245,7 @@ DEPENDENCIES
quiet_assets
rails
rails-boilerplate
rails_12factor
rake
rspec-rails
sass-rails
Expand Down
1 change: 1 addition & 0 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ production:
encoding: unicode
database: Timestampz2_production
pool: 5
username: root
password:

0 comments on commit 0ddfe1d

Please sign in to comment.