Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

use released gems

  • Loading branch information...
commit 639cc72e5122b0cd0091fbe410b7878f7babbf37 1 parent ac457d7
@drnic drnic authored
Showing with 70 additions and 105 deletions.
  1. +4 −4 Gemfile
  2. +66 −101 Gemfile.lock
View
8 Gemfile
@@ -1,15 +1,15 @@
source 'http://rubygems.org'
-gem "rails", "3.2.0.rc1", :git => "git://github.com/rails/rails.git", :branch => "3-2-stable"
+gem "rails", "~> 3.2.8"
-gem 'simple_form', '1.5.1'
+gem 'simple_form'
gem 'jquery-rails', '1.0.14'
gem 'rails_autolink'
platform :ruby do
- #gem 'pg'
- #gem 'sqlite3'
+ gem 'pg'
+ gem 'sqlite3'
gem 'mysql2', '~> 0.3.7'
gem 'unicorn'
end
View
167 Gemfile.lock
@@ -1,122 +1,103 @@
-GIT
- remote: git://github.com/rails/rails.git
- revision: f2e65b7d54c3034b35a5f248f2482e760cd85cd5
- branch: 3-2-stable
+GEM
+ remote: http://rubygems.org/
specs:
- actionmailer (3.2.0.rc1)
- actionpack (= 3.2.0.rc1)
- mail (~> 2.3.0)
- actionpack (3.2.0.rc1)
- activemodel (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
+ mail (~> 2.4.4)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0.rc1)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
+ journey (~> 1.0.4)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
- activerecord (3.2.0.rc1)
- activemodel (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
- arel (~> 3.0.0.rc1)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.0.rc1)
- activemodel (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
- activesupport (3.2.0.rc1)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
- rails (3.2.0.rc1)
- actionmailer (= 3.2.0.rc1)
- actionpack (= 3.2.0.rc1)
- activerecord (= 3.2.0.rc1)
- activeresource (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
- bundler (~> 1.0)
- railties (= 3.2.0.rc1)
- railties (3.2.0.rc1)
- actionpack (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
-
-GEM
- remote: http://rubygems.org/
- specs:
- activerecord-jdbc-adapter (1.2.0)
- activerecord-jdbcpostgresql-adapter (1.2.0)
- activerecord-jdbc-adapter (~> 1.2.0)
- jdbc-postgres (~> 9.0.0)
- arel (3.0.0.rc1)
- bouncy-castle-java (1.5.0146.1)
- builder (3.0.0)
+ arel (3.0.2)
+ builder (3.0.3)
erubis (2.7.0)
hike (1.2.1)
- i18n (0.6.0)
- jdbc-mysql (5.1.13)
- jdbc-postgres (9.0.801)
- jdbc-sqlite3 (3.7.2)
- journey (1.0.0.rc2)
+ i18n (0.6.1)
+ journey (1.0.4)
jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
- jruby-openssl (0.7.4)
- bouncy-castle-java
- jruby-rack (1.0.10)
- json (1.6.3)
- json (1.6.3-java)
- kgio (2.6.0)
- mail (2.3.0)
+ json (1.7.5)
+ kgio (2.7.4)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.4)
+ mime-types (1.19)
+ multi_json (1.3.6)
mysql2 (0.3.11)
+ pg (0.14.1)
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ puma (1.6.3)
+ rack (~> 1.2)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails_autolink (1.0.4)
- rails (>= 3.1.0)
- raindrops (0.7.0)
+ rails (3.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
+ bundler (~> 1.0)
+ railties (= 3.2.8)
+ rails_autolink (1.0.9)
+ rails (~> 3.1)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (>= 0.14.6, < 2.0)
+ raindrops (0.10.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- simple_form (1.5.1)
+ simple_form (2.0.2)
actionpack (~> 3.0)
activemodel (~> 3.0)
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.14.6)
+ sqlite3 (1.3.6)
+ thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- trinidad (1.2.3)
- jruby-rack (>= 1.0.9)
- trinidad_jars (>= 1.0.1)
- trinidad_jars (1.0.1)
- tzinfo (0.3.31)
- unicorn (4.1.1)
- kgio (~> 2.4)
+ tzinfo (0.3.33)
+ unicorn (4.3.1)
+ kgio (~> 2.6)
rack
- raindrops (~> 0.6)
+ raindrops (~> 0.7)
PLATFORMS
- java
ruby
DEPENDENCIES
@@ -127,28 +108,12 @@ DEPENDENCIES
jdbc-sqlite3
jquery-rails (= 1.0.14)
jruby-openssl
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- mysql2 (~> 0.2.7)
- pg (~> 0.13.2)
- puma
- rails (= 3.0.9)
-=======
-=======
->>>>>>> Testing mysql2 gem again.
mysql2 (~> 0.3.7)
-=======
- mysql2 (~> 0.2.7)
->>>>>>> Bumping mysql2 gem down to see if will work for 1.8.7 and 1.9.2
-=======
- mysql2 (~> 0.3.7)
->>>>>>> Testing out newer mysql2 again...
- rails (= 3.2.0.rc1)!
+ pg
+ puma
+ rails (~> 3.2.8)
rails_autolink
->>>>>>> Testing mysql2
- simple_form (= 1.5.1)
+ simple_form
sqlite3
thor
trinidad
Please sign in to comment.
Something went wrong with that request. Please try again.