cafe-grader-web

Commit r374:396d14f9000f public

parent | child
Description:
Updated gems, switched from git:// to https:// and cleaned up Gemfile quotation marks
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r374:396d14f9000f - - 2 files changed: 55 inserted, 55 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,25 +1,25
1 source 'https://rubygems.org'
1 source 'https://rubygems.org'
2
2
3 - gem 'rails', '3.2.19'
3 + gem 'rails', '3.2.21'
4
4
5 # Bundle edge Rails instead:
5 # Bundle edge Rails instead:
6 # gem 'rails', :git => 'git://github.com/rails/rails.git'
6 # gem 'rails', :git => 'git://github.com/rails/rails.git'
7
7
8 gem 'mysql2'
8 gem 'mysql2'
9
9
10 # Gems used only for assets and not required
10 # Gems used only for assets and not required
11 # in production environments by default.
11 # in production environments by default.
12 group :assets do
12 group :assets do
13 - gem 'sass-rails', '~> 3.2.3'
13 + gem 'sass-rails', '~> 3.2.6'
14 - gem 'coffee-rails', '~> 3.2.1'
14 + gem 'coffee-rails', '~> 3.2.2'
15
15
16 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
16 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
17 # gem 'therubyracer', :platforms => :ruby
17 # gem 'therubyracer', :platforms => :ruby
18
18
19 - gem 'uglifier', '>= 1.0.3'
19 + gem 'uglifier', '~> 2.6.0'
20 end
20 end
21
21
22 gem 'prototype-rails'
22 gem 'prototype-rails'
23
23
24 # To use ActiveModel has_secure_password
24 # To use ActiveModel has_secure_password
25 # gem 'bcrypt-ruby', '~> 3.0.0'
25 # gem 'bcrypt-ruby', '~> 3.0.0'
@@ -33,18 +33,18
33 # Deploy with Capistrano
33 # Deploy with Capistrano
34 # gem 'capistrano'
34 # gem 'capistrano'
35
35
36 # To use debugger
36 # To use debugger
37 # gem 'debugger'
37 # gem 'debugger'
38
38
39 - gem "haml"
39 + gem 'haml'
40 - gem "mail"
40 + gem 'mail'
41 - gem "rdiscount"
41 + gem 'rdiscount'
42 - gem "test-unit"
42 + gem 'test-unit'
43 - gem 'will_paginate', '~> 3.0.0'
43 + gem 'will_paginate', '~> 3.0.7'
44 gem 'dynamic_form'
44 gem 'dynamic_form'
45 gem 'in_place_editing'
45 gem 'in_place_editing'
46 - gem 'verification', :git => 'git://github.com/sikachu/verification.git'
46 + gem 'verification', :git => 'https://github.com/sikachu/verification.git'
47
47
48 group :test, :development do
48 group :test, :development do
49 - gem "rspec-rails", "~> 2.0"
49 + gem 'rspec-rails', '~> 2.99.0'
50 end
50 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,101 +1,101
1 GIT
1 GIT
2 - remote: git://github.com/sikachu/verification.git
2 + remote: https://github.com/sikachu/verification.git
3 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
3 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
4 specs:
4 specs:
5 verification (1.0.3)
5 verification (1.0.3)
6 actionpack (>= 3.0.0, < 5.0)
6 actionpack (>= 3.0.0, < 5.0)
7 activesupport (>= 3.0.0, < 5.0)
7 activesupport (>= 3.0.0, < 5.0)
8
8
9 GEM
9 GEM
10 remote: https://rubygems.org/
10 remote: https://rubygems.org/
11 specs:
11 specs:
12 - actionmailer (3.2.19)
12 + actionmailer (3.2.21)
13 - actionpack (= 3.2.19)
13 + actionpack (= 3.2.21)
14 mail (~> 2.5.4)
14 mail (~> 2.5.4)
15 - actionpack (3.2.19)
15 + actionpack (3.2.21)
16 - activemodel (= 3.2.19)
16 + activemodel (= 3.2.21)
17 - activesupport (= 3.2.19)
17 + activesupport (= 3.2.21)
18 builder (~> 3.0.0)
18 builder (~> 3.0.0)
19 erubis (~> 2.7.0)
19 erubis (~> 2.7.0)
20 journey (~> 1.0.4)
20 journey (~> 1.0.4)
21 rack (~> 1.4.5)
21 rack (~> 1.4.5)
22 rack-cache (~> 1.2)
22 rack-cache (~> 1.2)
23 rack-test (~> 0.6.1)
23 rack-test (~> 0.6.1)
24 sprockets (~> 2.2.1)
24 sprockets (~> 2.2.1)
25 - activemodel (3.2.19)
25 + activemodel (3.2.21)
26 - activesupport (= 3.2.19)
26 + activesupport (= 3.2.21)
27 builder (~> 3.0.0)
27 builder (~> 3.0.0)
28 - activerecord (3.2.19)
28 + activerecord (3.2.21)
29 - activemodel (= 3.2.19)
29 + activemodel (= 3.2.21)
30 - activesupport (= 3.2.19)
30 + activesupport (= 3.2.21)
31 arel (~> 3.0.2)
31 arel (~> 3.0.2)
32 tzinfo (~> 0.3.29)
32 tzinfo (~> 0.3.29)
33 - activeresource (3.2.19)
33 + activeresource (3.2.21)
34 - activemodel (= 3.2.19)
34 + activemodel (= 3.2.21)
35 - activesupport (= 3.2.19)
35 + activesupport (= 3.2.21)
36 - activesupport (3.2.19)
36 + activesupport (3.2.21)
37 i18n (~> 0.6, >= 0.6.4)
37 i18n (~> 0.6, >= 0.6.4)
38 multi_json (~> 1.0)
38 multi_json (~> 1.0)
39 arel (3.0.3)
39 arel (3.0.3)
40 builder (3.0.4)
40 builder (3.0.4)
41 coffee-rails (3.2.2)
41 coffee-rails (3.2.2)
42 coffee-script (>= 2.2.0)
42 coffee-script (>= 2.2.0)
43 railties (~> 3.2.0)
43 railties (~> 3.2.0)
44 coffee-script (2.3.0)
44 coffee-script (2.3.0)
45 coffee-script-source
45 coffee-script-source
46 execjs
46 execjs
47 - coffee-script-source (1.7.1)
47 + coffee-script-source (1.8.0)
48 diff-lcs (1.2.5)
48 diff-lcs (1.2.5)
49 dynamic_form (1.1.4)
49 dynamic_form (1.1.4)
50 erubis (2.7.0)
50 erubis (2.7.0)
51 - execjs (2.2.1)
51 + execjs (2.2.2)
52 - haml (4.0.5)
52 + haml (4.0.6)
53 tilt
53 tilt
54 hike (1.2.3)
54 hike (1.2.3)
55 - i18n (0.6.11)
55 + i18n (0.7.0)
56 in_place_editing (1.2.0)
56 in_place_editing (1.2.0)
57 journey (1.0.4)
57 journey (1.0.4)
58 json (1.8.1)
58 json (1.8.1)
59 mail (2.5.4)
59 mail (2.5.4)
60 mime-types (~> 1.16)
60 mime-types (~> 1.16)
61 treetop (~> 1.4.8)
61 treetop (~> 1.4.8)
62 mime-types (1.25.1)
62 mime-types (1.25.1)
63 multi_json (1.10.1)
63 multi_json (1.10.1)
64 - mysql2 (0.3.16)
64 + mysql2 (0.3.17)
65 polyglot (0.3.5)
65 polyglot (0.3.5)
66 - power_assert (0.1.3)
66 + power_assert (0.2.2)
67 prototype-rails (3.2.1)
67 prototype-rails (3.2.1)
68 rails (~> 3.2)
68 rails (~> 3.2)
69 rack (1.4.5)
69 rack (1.4.5)
70 rack-cache (1.2)
70 rack-cache (1.2)
71 rack (>= 0.4)
71 rack (>= 0.4)
72 rack-ssl (1.3.4)
72 rack-ssl (1.3.4)
73 rack
73 rack
74 rack-test (0.6.2)
74 rack-test (0.6.2)
75 rack (>= 1.0)
75 rack (>= 1.0)
76 - rails (3.2.19)
76 + rails (3.2.21)
77 - actionmailer (= 3.2.19)
77 + actionmailer (= 3.2.21)
78 - actionpack (= 3.2.19)
78 + actionpack (= 3.2.21)
79 - activerecord (= 3.2.19)
79 + activerecord (= 3.2.21)
80 - activeresource (= 3.2.19)
80 + activeresource (= 3.2.21)
81 - activesupport (= 3.2.19)
81 + activesupport (= 3.2.21)
82 bundler (~> 1.0)
82 bundler (~> 1.0)
83 - railties (= 3.2.19)
83 + railties (= 3.2.21)
84 - railties (3.2.19)
84 + railties (3.2.21)
85 - actionpack (= 3.2.19)
85 + actionpack (= 3.2.21)
86 - activesupport (= 3.2.19)
86 + activesupport (= 3.2.21)
87 rack-ssl (~> 1.3.2)
87 rack-ssl (~> 1.3.2)
88 rake (>= 0.8.7)
88 rake (>= 0.8.7)
89 rdoc (~> 3.4)
89 rdoc (~> 3.4)
90 thor (>= 0.14.6, < 2.0)
90 thor (>= 0.14.6, < 2.0)
91 - rake (10.3.2)
91 + rake (10.4.2)
92 rdiscount (2.1.7.1)
92 rdiscount (2.1.7.1)
93 rdoc (3.12.2)
93 rdoc (3.12.2)
94 json (~> 1.4)
94 json (~> 1.4)
95 - rspec-collection_matchers (1.0.0)
95 + rspec-collection_matchers (1.1.2)
96 rspec-expectations (>= 2.99.0.beta1)
96 rspec-expectations (>= 2.99.0.beta1)
97 rspec-core (2.99.2)
97 rspec-core (2.99.2)
98 rspec-expectations (2.99.2)
98 rspec-expectations (2.99.2)
99 diff-lcs (>= 1.1.3, < 2.0)
99 diff-lcs (>= 1.1.3, < 2.0)
100 rspec-mocks (2.99.2)
100 rspec-mocks (2.99.2)
101 rspec-rails (2.99.0)
101 rspec-rails (2.99.0)
@@ -104,48 +104,48
104 activesupport (>= 3.0)
104 activesupport (>= 3.0)
105 railties (>= 3.0)
105 railties (>= 3.0)
106 rspec-collection_matchers
106 rspec-collection_matchers
107 rspec-core (~> 2.99.0)
107 rspec-core (~> 2.99.0)
108 rspec-expectations (~> 2.99.0)
108 rspec-expectations (~> 2.99.0)
109 rspec-mocks (~> 2.99.0)
109 rspec-mocks (~> 2.99.0)
110 - sass (3.4.1)
110 + sass (3.4.9)
111 sass-rails (3.2.6)
111 sass-rails (3.2.6)
112 railties (~> 3.2.0)
112 railties (~> 3.2.0)
113 sass (>= 3.1.10)
113 sass (>= 3.1.10)
114 tilt (~> 1.3)
114 tilt (~> 1.3)
115 - sprockets (2.2.2)
115 + sprockets (2.2.3)
116 hike (~> 1.2)
116 hike (~> 1.2)
117 multi_json (~> 1.0)
117 multi_json (~> 1.0)
118 rack (~> 1.0)
118 rack (~> 1.0)
119 tilt (~> 1.1, != 1.3.0)
119 tilt (~> 1.1, != 1.3.0)
120 - test-unit (3.0.1)
120 + test-unit (3.0.8)
121 power_assert
121 power_assert
122 thor (0.19.1)
122 thor (0.19.1)
123 tilt (1.4.1)
123 tilt (1.4.1)
124 treetop (1.4.15)
124 treetop (1.4.15)
125 polyglot
125 polyglot
126 polyglot (>= 0.3.1)
126 polyglot (>= 0.3.1)
127 - tzinfo (0.3.41)
127 + tzinfo (0.3.42)
128 - uglifier (2.5.3)
128 + uglifier (2.6.0)
129 execjs (>= 0.3.0)
129 execjs (>= 0.3.0)
130 json (>= 1.8.0)
130 json (>= 1.8.0)
131 will_paginate (3.0.7)
131 will_paginate (3.0.7)
132
132
133 PLATFORMS
133 PLATFORMS
134 ruby
134 ruby
135
135
136 DEPENDENCIES
136 DEPENDENCIES
137 - coffee-rails (~> 3.2.1)
137 + coffee-rails (~> 3.2.2)
138 dynamic_form
138 dynamic_form
139 haml
139 haml
140 in_place_editing
140 in_place_editing
141 mail
141 mail
142 mysql2
142 mysql2
143 prototype-rails
143 prototype-rails
144 - rails (= 3.2.19)
144 + rails (= 3.2.21)
145 rdiscount
145 rdiscount
146 - rspec-rails (~> 2.0)
146 + rspec-rails (~> 2.99.0)
147 - sass-rails (~> 3.2.3)
147 + sass-rails (~> 3.2.6)
148 test-unit
148 test-unit
149 - uglifier (>= 1.0.3)
149 + uglifier (~> 2.6.0)
150 verification!
150 verification!
151 - will_paginate (~> 3.0.0)
151 + will_paginate (~> 3.0.7)
You need to be logged in to leave comments. Login now