Commit Graph

70 Commits

Author SHA1 Message Date
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Baptiste Barth 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang d00cc4d9b5 Upgrade to Rails 3.2.9 (#12393).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 20:22:43 +00:00
Jean-Philippe Lang 1ff8bbf080 Pins mysql gem to ~> 2.8.1.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 14:28:45 +00:00
Toshi MARUYAMA fd41840434 Gemfile: remove rake
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 22:44:13 +00:00
Jean-Philippe Lang 37c590bfef Unpin rake version.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 18:10:04 +00:00
Toshi MARUYAMA b0b8352bc5 Gemfile: pin rake version 0.9.2.2
CI server tests fail.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10799 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 04:46:46 +00:00
Toshi MARUYAMA 37a600475c Gemfile: pin rake version 0.9
CI server tests fail.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10798 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 04:24:54 +00:00
Toshi MARUYAMA a71ff93f8f fix JRuby 1.6 tests fail on CI server (#12228)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 03:59:09 +00:00
Toshi MARUYAMA 49f2d4729d prevent rake task error on JRuby 1.7 (#12228)
Following is "rake db:migrate RAILS_ENV=test" output
on jruby 1.7.0 (1.9.3p203) 2012-10-22 ff1ebbe on OpenJDK Client VM 1.6.0_18-b18 [linux-i386].

<pre>
ArgumentError: file not found: db:migrate
   non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:167
          map! at org/jruby/RubyArray.java:2387
   non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:146
   non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:207
  process_args at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:52
          _run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:891
           run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:884
           run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:21
       autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:326
      run_once at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:27
       autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:325
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10737 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 01:52:01 +00:00
Jean-Philippe Lang 1f7a944d14 XML output broken with builder 3.0.1.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10306 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-06 22:34:21 +00:00
Jean-Philippe Lang 265baa1b2c Upgrade to Rails 3.2.8 (#11758).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:08:51 +00:00
Toshi MARUYAMA 139ddd639f backout r10247
Gemfile: pin i18n gem version 0.6.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 05:33:58 +00:00
Toshi MARUYAMA 9a57cc18e3 Gemfile: pin i18n gem version 0.6.0
Tests on CI server fails.
http://www.redmine.org/builds/logs/build_trunk_sqlite3_ruby-1.9.3-p194_580.html

<pre>
Failure:
  <"Due date changed from 01 01 2010 to 31 01 2010"> expected to be =~
  </01\/31\/2010/>.
test: IssuesHelper#show_detail with a due_date attribute should format the current date. (IssuesHelperTest)
test/unit/helpers/issues_helper_test.rb:127:in `block (3 levels) in <class:IssuesHelperTest>'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10247 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-31 23:44:35 +00:00
Toshi MARUYAMA 2e536a2c56 Gemfile: mocha version up 0.12.3
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 23:10:50 +00:00