Download as
Browse Code »

Commit d138bf331dbc0ac8a21ff8d87e8f5615cb34d477

Authored by Shuky Dvir
2 parents 6112f70e fb70eaa0
Exists in master and in 1 other branch production

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

Showing 3 changed files with 32 additions and 31 deletions   Show diff stats
Gemfile
  Diff comments   View file @d138bf3
1 1 source 'http://rubygems.org'
2 2  
3   -gem 'rails', '3.2.6'
  3 +gem 'rails', '3.2.8'
4 4  
5 5 gem 'nokogiri'
6 6 gem 'mongoid', '~> 2.4.10'
... ...
Gemfile.lock
  Diff comments   View file @d138bf3
... ... @@ -2,35 +2,35 @@ GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4 4 SystemTimer (1.2.3)
5   - actionmailer (3.2.6)
6   - actionpack (= 3.2.6)
  5 + actionmailer (3.2.8)
  6 + actionpack (= 3.2.8)
7 7 mail (~> 2.4.4)
8 8 actionmailer_inline_css (1.3.1)
9 9 actionmailer (>= 3.0.0)
10 10 nokogiri (>= 1.4.4)
11 11 premailer (>= 1.7.1)
12   - actionpack (3.2.6)
13   - activemodel (= 3.2.6)
14   - activesupport (= 3.2.6)
  12 + actionpack (3.2.8)
  13 + activemodel (= 3.2.8)
  14 + activesupport (= 3.2.8)
15 15 builder (~> 3.0.0)
16 16 erubis (~> 2.7.0)
17   - journey (~> 1.0.1)
  17 + journey (~> 1.0.4)
18 18 rack (~> 1.4.0)
19 19 rack-cache (~> 1.2)
20 20 rack-test (~> 0.6.1)
21 21 sprockets (~> 2.1.3)
22   - activemodel (3.2.6)
23   - activesupport (= 3.2.6)
  22 + activemodel (3.2.8)
  23 + activesupport (= 3.2.8)
24 24 builder (~> 3.0.0)
25   - activerecord (3.2.6)
26   - activemodel (= 3.2.6)
27   - activesupport (= 3.2.6)
  25 + activerecord (3.2.8)
  26 + activemodel (= 3.2.8)
  27 + activesupport (= 3.2.8)
28 28 arel (~> 3.0.2)
29 29 tzinfo (~> 0.3.29)
30   - activeresource (3.2.6)
31   - activemodel (= 3.2.6)
32   - activesupport (= 3.2.6)
33   - activesupport (3.2.6)
  30 + activeresource (3.2.8)
  31 + activemodel (= 3.2.8)
  32 + activesupport (= 3.2.8)
  33 + activesupport (3.2.8)
34 34 i18n (~> 0.6)
35 35 multi_json (~> 1.0)
36 36 addressable (2.3.2)
... ... @@ -39,7 +39,7 @@ GEM
39 39 bson (1.6.2)
40 40 bson_ext (1.6.2)
41 41 bson (~> 1.6.2)
42   - builder (3.0.0)
  42 + builder (3.0.3)
43 43 capistrano (2.13.3)
44 44 highline
45 45 net-scp (>= 1.0.0)
... ... @@ -99,12 +99,12 @@ GEM
99 99 builder
100 100 htmlentities (4.3.1)
101 101 httpauth (0.1)
102   - i18n (0.6.0)
  102 + i18n (0.6.1)
103 103 inherited_resources (1.3.1)
104 104 has_scope (~> 0.5.0)
105 105 responders (~> 0.6)
106 106 journey (1.0.4)
107   - json (1.7.4)
  107 + json (1.7.5)
108 108 jwt (0.1.5)
109 109 multi_json (>= 1.0)
110 110 kaminari (0.13.0)
... ... @@ -195,19 +195,19 @@ GEM
195 195 rack-ssl-enforcer (0.2.4)
196 196 rack-test (0.6.1)
197 197 rack (>= 1.0)
198   - rails (3.2.6)
199   - actionmailer (= 3.2.6)
200   - actionpack (= 3.2.6)
201   - activerecord (= 3.2.6)
202   - activeresource (= 3.2.6)
203   - activesupport (= 3.2.6)
  198 + rails (3.2.8)
  199 + actionmailer (= 3.2.8)
  200 + actionpack (= 3.2.8)
  201 + activerecord (= 3.2.8)
  202 + activeresource (= 3.2.8)
  203 + activesupport (= 3.2.8)
204 204 bundler (~> 1.0)
205   - railties (= 3.2.6)
  205 + railties (= 3.2.8)
206 206 rails_autolink (1.0.9)
207 207 rails (~> 3.1)
208   - railties (3.2.6)
209   - actionpack (= 3.2.6)
210   - activesupport (= 3.2.6)
  208 + railties (3.2.8)
  209 + actionpack (= 3.2.8)
  210 + activesupport (= 3.2.8)
211 211 rack-ssl (~> 1.3.2)
212 212 rake (>= 0.8.7)
213 213 rdoc (~> 3.4)
... ... @@ -258,7 +258,7 @@ GEM
258 258 daemons (>= 1.0.9)
259 259 eventmachine (>= 0.12.6)
260 260 rack (>= 1.0.0)
261   - thor (0.15.4)
  261 + thor (0.16.0)
262 262 tilt (1.3.3)
263 263 treetop (1.4.10)
264 264 polyglot
... ... @@ -314,7 +314,7 @@ DEPENDENCIES
314 314 oruen_redmine_client
315 315 pivotal-tracker
316 316 rack-ssl-enforcer
317   - rails (= 3.2.6)
  317 + rails (= 3.2.8)
318 318 rails_autolink (~> 1.0.9)
319 319 ri_cal
320 320 rspec (~> 2.6)
... ...
config/initializers/_load_config.rb
  Diff comments   View file @d138bf3
... ... @@ -13,6 +13,7 @@ unless defined?(Errbit::Config)
13 13 Errbit::Config.confirm_resolve_err = ENV['ERRBIT_CONFIRM_RESOLVE_ERR']
14 14 Errbit::Config.user_has_username = ENV['ERRBIT_USER_HAS_USERNAME']
15 15 Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER']
  16 + Errbit::Config.enforce_ssl = ENV['ERRBIT_ENFORCE_SSL']
16 17  
17 18 Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']
18 19 Errbit::Config.gravatar_default = ENV['ERRBIT_GRAVATAR_DEFAULT']
... ...