Skip to content

Commit

Permalink
revert some gems to earlier versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabe Kopley committed Jan 9, 2012
1 parent de4f304 commit be7eba1
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 49 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -4,3 +4,4 @@ log/*.log
tmp/
.sass-cache/
*.sw?
public/assets
9 changes: 0 additions & 9 deletions Gemfile
Expand Up @@ -22,14 +22,5 @@ end

gem 'jquery-rails'

# Use unicorn as the web server
# gem 'unicorn'

# Deploy with Capistrano
# gem 'capistrano'

group :development, :test do
# fancy debugger
gem 'pry'
gem 'pry-nav'
end
77 changes: 38 additions & 39 deletions Gemfile.lock
Expand Up @@ -30,68 +30,62 @@ GEM
activesupport (3.1.3)
multi_json (~> 1.0)
addressable (2.2.6)
archive-tar-minitar (0.5.2)
arel (2.2.1)
bson (1.5.2)
bson_ext (1.5.2)
bson (= 1.5.2)
bson (1.3.1)
bson_ext (1.3.1)
builder (3.0.0)
coderay (0.9.8)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.2.0)
columnize (0.3.4)
erubis (2.7.0)
execjs (1.2.13)
multi_json (~> 1.0)
formtastic (2.0.2)
rails (~> 3.0)
haml (3.1.4)
formtastic (1.2.4)
actionpack (>= 2.3.7)
activesupport (>= 2.3.7)
i18n (~> 0.4)
haml (3.1.2)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
heroku (2.17.0)
heroku (2.4.0)
launchy (>= 0.3.2)
rest-client (~> 1.6.1)
rubyzip
term-ansicolor (~> 1.0.5)
hike (1.2.1)
htmlentities (4.3.1)
htmlentities (4.3.0)
i18n (0.6.0)
jquery-rails (1.0.19)
jquery-rails (1.0.12)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.4)
json (1.5.3)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.3.10.4)
libv8 (3.3.10.2)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.6.7)
ruby_parser (>= 2.3.1)
mime-types (1.17.2)
mongo (1.5.2)
bson (= 1.5.2)
mongoid (2.4.0)
activemodel (~> 3.1)
mongo (1.3.1)
bson (>= 1.3.1)
mongoid (2.1.4)
activemodel (~> 3.0)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
pry (0.9.7.4)
coderay (~> 0.9.8)
method_source (~> 0.6.7)
ruby_parser (>= 2.3.1)
slop (~> 2.1.0)
pry-nav (0.0.4)
pry (~> 0.9.7.4)
rack (1.3.6)
rack-cache (1.1)
rack (>= 0.4)
Expand Down Expand Up @@ -119,38 +113,44 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
rest-client (1.6.3)
mime-types (>= 1.16)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
rubyzip (0.9.5)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sass (3.1.12)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (~> 3.1.10)
tilt (~> 1.3.2)
sexp_processor (3.0.10)
slop (2.1.0)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7)
therubyracer (0.9.9)
term-ansicolor (1.0.6)
therubyracer (0.9.2)
libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
typhoeus (0.3.3)
typhoeus (0.2.4)
mime-types
mime-types
tzinfo (0.3.31)
uglifier (1.2.1)
uglifier (1.0.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
wordnik (4.06.12)
wordnik (4.06.04)
activemodel (>= 3.0.3)
addressable (>= 2.2.4)
htmlentities (>= 4.2.4)
Expand All @@ -171,9 +171,8 @@ DEPENDENCIES
jquery-rails
json
mongoid
pry
pry-nav
rails (~> 3.1.3)
ruby-debug19
sass-rails
therubyracer
uglifier
Expand Down
2 changes: 1 addition & 1 deletion config/mongoid.yml
Expand Up @@ -12,7 +12,7 @@ production:
port: <%= ENV['MONGOID_PORT'] %>
username: <%= ENV['MONGOID_USERNAME'] %>
password: <%= ENV['MONGOID_PASSWORD'] %>
database: <%= ENV['MONGOID_DATABASE'] %>
database: <%= ENV['MONGOID_DATABASE'] || 'green_eggs_production' %>
# slaves:
# - host: slave1.local
# port: 27018
Expand Down

0 comments on commit be7eba1

Please sign in to comment.