Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc

gem "bootstrap-sass"
gem "simple_form", "~> 3.1.0.rc2", github: "plataformatec/simple_form", branch: "master"
gem "simple_form", "~> 3.1.0.rc2"
gem "devise", "~> 3.4.1"
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand Down
16 changes: 5 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
GIT
remote: git://github.com/plataformatec/simple_form.git
revision: d49263a069b44b84d295a8c5e0debff2dd26a077
branch: master
specs:
simple_form (3.1.0)
actionpack (~> 4.0)
activemodel (~> 4.0)

GIT
remote: git://github.com/techbang/capistrano3-unicorn.git
revision: dbdc8cd8c8329de9ba390faa50dc727fb4f7326a
Expand Down Expand Up @@ -211,6 +202,9 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sexp_processor (4.4.4)
simple_form (3.1.1)
actionpack (~> 4.0)
activemodel (~> 4.0)
slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
Expand Down Expand Up @@ -278,7 +272,7 @@ DEPENDENCIES
rails_best_practices
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simple_form (~> 3.1.0.rc2)!
simple_form (~> 3.1.0.rc2)
spring
sqlite3
therubyracer
Expand All @@ -288,4 +282,4 @@ DEPENDENCIES
web-console (~> 2.0)

BUNDLED WITH
1.10.6
1.11.2