aboutsummaryrefslogtreecommitdiffstats
path: root/www/redmine/files/patch-Gemfile
blob: f09c4a62493c62d1a3e502d9d300754453822057 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- Gemfile.orig        2015-02-19 13:15:56.000000000 -0600
+++ Gemfile     2015-03-15 12:49:50.000000000 -0500
@@ -1,13 +1,13 @@
 source 'https://rubygems.org'

-gem "rails", "3.2.21"
+gem "rails", "~> 3.2"
 gem "jquery-rails", "~> 3.1.1"
 gem "coderay", "~> 1.1.0"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", ">= 3.0.4"
-gem "request_store", "1.0.5"
+gem "request_store", "~> 1.1.0"
 gem "mime-types"
 gem "rbpdf", "~> 1.18.5"

-gem "i18n", "~> 0.6.11"
+gem "i18n", "~> 0.7.0"

@@ -18,7 +18,7 @@

 # Optional gem for OpenID authentication
 group :openid do
-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
+  gem "ruby-openid", "~> 2.7", :require => "openid"
   gem "rack-openid"
 end

@@ -35,7 +35,7 @@
   # Optional Markdown support, not for JRuby
   group :markdown do
     # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
-    gem "redcarpet", "~> 2.3.0"
+    gem "redcarpet", "~> 3.0"
   end
 end

@@ -81,23 +81,6 @@
   warn("Please configure your config/database.yml first")
 end

-group :development do
-  gem "rdoc", ">= 2.4.2"
-  gem "yard"
-end
-
-group :test do
-  gem "shoulda", "~> 3.3.2"
-  gem "shoulda-matchers", "1.4.1"
-  gem "mocha", "~> 1.0.0", :require => 'mocha/api'
-  if RUBY_VERSION >= '1.9.3'
-    gem "capybara"
-    gem "selenium-webdriver"
-    # building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414
-    gem "ffi", "1.9.6"
-  end
-end
-
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exists?(local_gemfile)
   puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`