Download as
Browse Code »

Commit f707fd4661cdd53dc0ad7801f95a6849d15cfc35

Authored by Nick Recobra
2 parents 6b3dc106 d0b9c018
Exists in master and in 1 other branch production

Merge branch 'master' of https://github.com/jlecour/errbit into jlecour-master

Showing 2 changed files with 39 additions and 39 deletions   Show diff stats
Gemfile
  Diff comments   View file @f707fd4
1 1 source 'http://rubygems.org'
2 2  
3   -gem 'rails', '3.0.3'
  3 +gem 'rails', '3.0.5'
4 4 gem 'nokogiri'
5   -gem 'mongoid', '~> 2.0.0.rc.6'
  5 +gem 'mongoid', '~> 2.0.0.rc.7'
6 6 gem 'haml'
7 7 gem 'will_paginate'
8   -gem 'devise', '~> 1.1.3'
  8 +gem 'devise', '~> 1.1.8'
9 9  
10 10 platform :ruby do
11 11 gem 'bson_ext', '~> 1.2'
12 12 end
13 13  
14 14 group :development, :test do
15   - gem 'rspec-rails', '~> 2.1'
  15 + gem 'rspec-rails', '~> 2.5'
16 16 end
17 17  
18 18 group :test do
19   - gem 'rspec', '~> 2.1'
  19 + gem 'rspec', '~> 2.5'
20 20 gem 'database_cleaner', '~> 0.6.0'
21 21 gem 'factory_girl_rails'
22 22 end
... ...
Gemfile.lock
  Diff comments   View file @f707fd4
... ... @@ -2,39 +2,39 @@ GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4 4 abstract (1.0.0)
5   - actionmailer (3.0.3)
6   - actionpack (= 3.0.3)
7   - mail (~> 2.2.9)
8   - actionpack (3.0.3)
9   - activemodel (= 3.0.3)
10   - activesupport (= 3.0.3)
  5 + actionmailer (3.0.5)
  6 + actionpack (= 3.0.5)
  7 + mail (~> 2.2.15)
  8 + actionpack (3.0.5)
  9 + activemodel (= 3.0.5)
  10 + activesupport (= 3.0.5)
11 11 builder (~> 2.1.2)
12 12 erubis (~> 2.6.6)
13 13 i18n (~> 0.4)
14 14 rack (~> 1.2.1)
15 15 rack-mount (~> 0.6.13)
16   - rack-test (~> 0.5.6)
  16 + rack-test (~> 0.5.7)
17 17 tzinfo (~> 0.3.23)
18   - activemodel (3.0.3)
19   - activesupport (= 3.0.3)
  18 + activemodel (3.0.5)
  19 + activesupport (= 3.0.5)
20 20 builder (~> 2.1.2)
21 21 i18n (~> 0.4)
22   - activerecord (3.0.3)
23   - activemodel (= 3.0.3)
24   - activesupport (= 3.0.3)
  22 + activerecord (3.0.5)
  23 + activemodel (= 3.0.5)
  24 + activesupport (= 3.0.5)
25 25 arel (~> 2.0.2)
26 26 tzinfo (~> 0.3.23)
27   - activeresource (3.0.3)
28   - activemodel (= 3.0.3)
29   - activesupport (= 3.0.3)
30   - activesupport (3.0.3)
  27 + activeresource (3.0.5)
  28 + activemodel (= 3.0.5)
  29 + activesupport (= 3.0.5)
  30 + activesupport (3.0.5)
31 31 arel (2.0.9)
32 32 bcrypt-ruby (2.1.4)
33 33 bson (1.2.4)
34 34 bson_ext (1.2.4)
35 35 builder (2.1.2)
36 36 database_cleaner (0.6.5)
37   - devise (1.1.7)
  37 + devise (1.1.8)
38 38 bcrypt-ruby (~> 2.1.2)
39 39 warden (~> 1.0.2)
40 40 diff-lcs (1.1.2)
... ... @@ -61,22 +61,22 @@ GEM
61 61 will_paginate (~> 3.0.pre)
62 62 nokogiri (1.4.4)
63 63 polyglot (0.3.1)
64   - rack (1.2.1)
  64 + rack (1.2.2)
65 65 rack-mount (0.6.13)
66 66 rack (>= 1.0.0)
67 67 rack-test (0.5.7)
68 68 rack (>= 1.0)
69   - rails (3.0.3)
70   - actionmailer (= 3.0.3)
71   - actionpack (= 3.0.3)
72   - activerecord (= 3.0.3)
73   - activeresource (= 3.0.3)
74   - activesupport (= 3.0.3)
  69 + rails (3.0.5)
  70 + actionmailer (= 3.0.5)
  71 + actionpack (= 3.0.5)
  72 + activerecord (= 3.0.5)
  73 + activeresource (= 3.0.5)
  74 + activesupport (= 3.0.5)
75 75 bundler (~> 1.0)
76   - railties (= 3.0.3)
77   - railties (3.0.3)
78   - actionpack (= 3.0.3)
79   - activesupport (= 3.0.3)
  76 + railties (= 3.0.5)
  77 + railties (3.0.5)
  78 + actionpack (= 3.0.5)
  79 + activesupport (= 3.0.5)
80 80 rake (>= 0.8.7)
81 81 thor (~> 0.14.4)
82 82 rake (0.8.7)
... ... @@ -96,7 +96,7 @@ GEM
96 96 thor (0.14.6)
97 97 treetop (1.4.9)
98 98 polyglot (>= 0.3.1)
99   - tzinfo (0.3.24)
  99 + tzinfo (0.3.25)
100 100 warden (1.0.3)
101 101 rack (>= 1.0.0)
102 102 will_paginate (3.0.pre2)
... ... @@ -107,12 +107,12 @@ PLATFORMS
107 107 DEPENDENCIES
108 108 bson_ext (~> 1.2)
109 109 database_cleaner (~> 0.6.0)
110   - devise (~> 1.1.3)
  110 + devise (~> 1.1.8)
111 111 factory_girl_rails
112 112 haml
113   - mongoid (~> 2.0.0.rc.6)
  113 + mongoid (~> 2.0.0.rc.7)
114 114 nokogiri
115   - rails (= 3.0.3)
116   - rspec (~> 2.1)
117   - rspec-rails (~> 2.1)
  115 + rails (= 3.0.5)
  116 + rspec (~> 2.5)
  117 + rspec-rails (~> 2.5)
118 118 will_paginate
... ...