645749eea8
Merged r12906 from trunk to 2.5-stable
...
update Rails to 3.2.17
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12907 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-19 10:17:14 +00:00
9e71d89cdb
Gemfile: use awesome_nested_set 2.1.6 gem
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12734 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 06:48:38 +00:00
e1189c5335
Use the mime-types gem for getting mime types from filenames ( #15790 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12483 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-05 16:35:59 +00:00
a657a12450
Don't load redcarpet with JRuby.
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 17:07:51 +00:00
471e01ca50
Adds experimental support for Markdown formatting with redcarpet ( #15520 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12452 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 13:05:10 +00:00
8a123b178c
update Rails version 3.2.16
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12355 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-04 07:04:15 +00:00
bc0ec54afa
Removed database_cleaner dependency ( #15377 ).
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12298 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-18 21:56:26 +00:00
b96941763d
upgrade activerecord-jdbc-adapter to 1.3.2
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 16:44:44 +00:00
3661766edc
Upgrade to Rails 3.2.15.
...
git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 07:51:00 +00:00
2e1f80dcde
Gemfile: remove "i18n"
...
activesupport 3.2.13 requires i18n 0.6.1 explicitly.
197b9f4d61
2013-10-29 06:24:28 +00:00
56639689e0
back out r12241 (back out Rails version 3.2.13)
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-29 05:45:44 +00:00
2cc413351a
Gemfile: update Rails version 3.2.15
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-29 05:18:06 +00:00
7f22cc6113
Upgrade CodeRay to 1.1.0 ( #8253 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-26 08:55:50 +00:00
13f6cd6b71
revert r12175 ( #14883 )
...
revert jdbc adapter version to above 1.2.6
due to test failure by "stack level too deep".
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12179 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 03:25:06 +00:00
5259da5e80
Gemfile: update jdbc adapter version above 1.3.0 ( #14883 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12175 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 02:01:25 +00:00
3bc1dd573a
Gemfile: update ruby-openid version above 2.3.0 ( #14919 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12173 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 00:18:26 +00:00
c136e6bc60
Gemfile: update jdbc adapter version above 1.2.6 ( #14883 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12172 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 23:52:00 +00:00
a43eb91f45
update ruby-openid version to 2.2.3
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12033 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-19 15:21:14 +00:00
17378152bf
use database_cleaner ( #12822 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11974 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-14 09:59:21 +00:00
01411ab567
prevent coderay "warning: already initialized constant" on Ruby 1.8.7 ( #13692 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11925 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-04 14:07:46 +00:00
596366b062
upgrade mocha 0.14 and remove deprecation warning
...
<pre>
Mocha deprecation warning: Change `require 'mocha'` to `require 'mocha/setup'`.
</pre>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11896 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-21 12:57:11 +00:00
ef153a5bca
Improve plugins' Gemfile loading ( #14028 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11826 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-11 11:19:21 +00:00
2b022ac097
install capybara on only Ruby 1.9.3 or higher ( #12822 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11806 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-09 13:03:28 +00:00
00f15828a2
upgrade capybara to 2.1 ( #12822 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-09 12:21:45 +00:00
cf1cc08c49
upgrade Rails 3.2.13
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11649 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 05:23:52 +00:00
e41b90c71c
upgrade mocha ~> 0.13.3
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11648 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 03:28:13 +00:00
134aeb2ca8
backout r11644.
...
revert Rails version to 3.2.12.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11647 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 03:28:03 +00:00
b8a70f2e24
upgrade Rails 3.2.13
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11644 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 02:27:16 +00:00
953b3619d4
Distinguish mysql/mysql2 adapters in Gemfile ( #13270 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11494 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-28 17:20:28 +00:00
9a8f430db6
Ruby2.0: switch mysql2 platforms by RUBY_VERSION
...
It seems old bundler does not support :mri_20 and :mingw_20
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11490 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-26 12:20:45 +00:00
23941adee1
Ruby2.0: add platforms to Gemfile mysql2
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11489 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-26 11:41:20 +00:00
bf917a61e7
Ruby2.0: add "require 'yaml'" to Gemfile
...
On ruby 2.0.0p0 (2013-02-24 revision 39474) [x86_64-linux]:
<pre>
$ ruby script/about
There was an error in your Gemfile, and Bundler cannot continue.
</pre>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11488 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-26 11:41:09 +00:00
2ffbfacf5f
back out r11486
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11487 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-26 11:40:58 +00:00
3f67ec4436
Require 'yaml'.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11486 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-25 17:31:58 +00:00
0cefb7716e
Use https://rubygems.org as gem source ( #13173 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11464 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 10:13:43 +00:00
204abe392b
upgrade Rails to 3.2.12
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11353 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 00:20:55 +00:00
a375ab498f
Gemfile: unpin mocha version
...
This is pinned by r10155 and r10167 due to CI server failure.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11327 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-04 08:33:53 +00:00
04a2ca9ce7
remove "test-unit" from Gemfile
...
This is added by r10137 (#10320 , #10818 ) and shoulda version was upgraded by r11324.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11325 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-04 08:05:21 +00:00
69ff805c8d
Upgrade shoulda.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11324 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-03 15:49:02 +00:00
b0f496a58d
Parse database.yml with erb ( #13004 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-29 18:02:20 +00:00
9c1077841e
Adds first Capybara tests ( #12822 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11270 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-26 14:36:02 +00:00
eb5675f4bc
More specific warning.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-21 20:53:52 +00:00
0450547b66
Don't abort when database.yml is not present.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11202 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-19 14:44:26 +00:00
04ab2f2458
Bundle only the required database gems and adds sqlserver support ( #12713 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11194 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-15 19:23:03 +00:00
4c6a0535fc
Upgrade to Rails 3.2.11
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11140 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-08 22:52:00 +00:00
0337d9abc3
Use activerecord-jdbc-adapter 1.2.5.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11114 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-04 09:00:55 +00:00
d264911f14
Upgrade to Rails 3.2.10.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11109 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-03 22:54:33 +00:00
3644571d8a
cannot load Java class com.mysql.jdbc.Driver error with jdbc-mysql 5.1.22.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11089 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-02 11:59:25 +00:00
11977f08a7
Tests broken with activerecord-jdbc-adapter 1.2.3.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11085 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-26 14:16:42 +00:00
1bcff510b1
Don't use jruby-openssl with JRuby 1.7.0 ( #12228 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10955 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-08 09:22:46 +00:00
Toshi MARUYAMA
Jean-Philippe Lang
Jean-Baptiste Barth