Download as
Browse Code »

Commit 20ea2dab2f99b6b39d8b69fc44ec0e2bc6dc4b6c

Authored by Nathan Broadbent
1 parent c31d03b7
Exists in master and in 1 other branch production

Reverted mongo, bson and bson_ext to = 1.3.1, due to later gems being yanked bec… 

…ause of critical bugs... (see http://groups.google.com/group/mongodb-user/browse_thread/thread/7ddaabe02d43fbab). Also commented out rpm_contrib (new_relic), because it should be somehow optional.
Showing 2 changed files with 12 additions and 18 deletions   Show diff stats
@@ -3,6 +3,7 @@ source 'http://rubygems.org' @@ -3,6 +3,7 @@ source 'http://rubygems.org'
3 gem 'rails', '3.0.10' 3 gem 'rails', '3.0.10'
4 gem 'nokogiri' 4 gem 'nokogiri'
5 gem 'mongoid', '2.1.2' 5 gem 'mongoid', '2.1.2'
  6 +
6 gem 'haml' 7 gem 'haml'
7 gem 'htmlentities', "~> 4.3.0" 8 gem 'htmlentities', "~> 4.3.0"
8 gem 'devise', '~> 1.4.0' 9 gem 'devise', '~> 1.4.0'
@@ -20,7 +21,9 @@ gem 'actionmailer_inline_css', "~> 1.3.0" @@ -20,7 +21,9 @@ gem 'actionmailer_inline_css', "~> 1.3.0"
20 gem 'kaminari' 21 gem 'kaminari'
21 22
22 platform :ruby do 23 platform :ruby do
23 - gem 'bson_ext', '~> 1.4.0' 24 + gem 'mongo', '= 1.3.1'
  25 + gem 'bson', '= 1.3.1'
  26 + gem 'bson_ext', '= 1.3.1'
24 end 27 end
25 28
26 gem 'ri_cal' 29 gem 'ri_cal'
@@ -34,7 +37,7 @@ group :development, :test do @@ -34,7 +37,7 @@ group :development, :test do
34 gem 'ruby-debug', :platform => :mri_18 37 gem 'ruby-debug', :platform => :mri_18
35 gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug' 38 gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
36 end 39 end
37 - gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update" 40 + # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update"
38 end 41 end
39 42
40 group :test do 43 group :test do
1 -GIT  
2 - remote: git://github.com/bensymonds/rpm_contrib.git  
3 - revision: 84ee78da6d0f154468d47c9e1e6597997e157291  
4 - branch: mongo-1.4.0_update  
5 - specs:  
6 - rpm_contrib (2.1.6.beta1)  
7 - newrelic_rpm (>= 3.1.1)  
8 - newrelic_rpm (>= 3.1.1)  
9 -  
10 GEM 1 GEM
11 remote: http://rubygems.org/ 2 remote: http://rubygems.org/
12 specs: 3 specs:
@@ -46,8 +37,8 @@ GEM @@ -46,8 +37,8 @@ GEM
46 archive-tar-minitar (0.5.2) 37 archive-tar-minitar (0.5.2)
47 arel (2.0.10) 38 arel (2.0.10)
48 bcrypt-ruby (3.0.1) 39 bcrypt-ruby (3.0.1)
49 - bson (1.4.0)  
50 - bson_ext (1.4.0) 40 + bson (1.3.1)
  41 + bson_ext (1.3.1)
51 builder (2.1.2) 42 builder (2.1.2)
52 columnize (0.3.4) 43 columnize (0.3.4)
53 crack (0.3.1) 44 crack (0.3.1)
@@ -105,8 +96,8 @@ GEM @@ -105,8 +96,8 @@ GEM
105 mime-types (~> 1.16) 96 mime-types (~> 1.16)
106 treetop (~> 1.4.8) 97 treetop (~> 1.4.8)
107 mime-types (1.16) 98 mime-types (1.16)
108 - mongo (1.4.0)  
109 - bson (= 1.4.0) 99 + mongo (1.3.1)
  100 + bson (>= 1.3.1)
110 mongoid (2.1.2) 101 mongoid (2.1.2)
111 activemodel (~> 3.0) 102 activemodel (~> 3.0)
112 mongo (~> 1.3) 103 mongo (~> 1.3)
@@ -118,7 +109,6 @@ GEM @@ -118,7 +109,6 @@ GEM
118 railties (>= 3.0.0) 109 railties (>= 3.0.0)
119 multi_json (1.0.3) 110 multi_json (1.0.3)
120 multipart-post (1.1.3) 111 multipart-post (1.1.3)
121 - newrelic_rpm (3.2.0)  
122 nokogiri (1.5.0) 112 nokogiri (1.5.0)
123 octokit (0.6.4) 113 octokit (0.6.4)
124 addressable (~> 2.2.6) 114 addressable (~> 2.2.6)
@@ -224,7 +214,8 @@ PLATFORMS @@ -224,7 +214,8 @@ PLATFORMS
224 DEPENDENCIES 214 DEPENDENCIES
225 SystemTimer 215 SystemTimer
226 actionmailer_inline_css (~> 1.3.0) 216 actionmailer_inline_css (~> 1.3.0)
227 - bson_ext (~> 1.4.0) 217 + bson (= 1.3.1)
  218 + bson_ext (= 1.3.1)
228 database_cleaner (~> 0.6.0) 219 database_cleaner (~> 0.6.0)
229 devise (~> 1.4.0) 220 devise (~> 1.4.0)
230 email_spec 221 email_spec
@@ -236,6 +227,7 @@ DEPENDENCIES @@ -236,6 +227,7 @@ DEPENDENCIES
236 inherited_resources 227 inherited_resources
237 kaminari 228 kaminari
238 lighthouse-api 229 lighthouse-api
  230 + mongo (= 1.3.1)
239 mongoid (= 2.1.2) 231 mongoid (= 2.1.2)
240 mongoid_rails_migrations 232 mongoid_rails_migrations
241 nokogiri 233 nokogiri
@@ -244,7 +236,6 @@ DEPENDENCIES @@ -244,7 +236,6 @@ DEPENDENCIES
244 pivotal-tracker 236 pivotal-tracker
245 rails (= 3.0.10) 237 rails (= 3.0.10)
246 ri_cal 238 ri_cal
247 - rpm_contrib!  
248 rspec (~> 2.6) 239 rspec (~> 2.6)
249 rspec-rails (~> 2.6) 240 rspec-rails (~> 2.6)
250 ruby-debug 241 ruby-debug