cfec2018e3
Merged r11648, r11649, r11650 from trunk to 2.3-stable.
...
upgrade Rails 3.2.13.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 08:21:46 +00:00
20cd146e93
Backported r11494 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 11:07:55 +00:00
ddf0307718
Merged r11488 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:47:27 +00:00
a4bee12e5a
Merged r11464 from trunk ( #13173 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11465 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 10:14:22 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
3f1c35b71e
Tests not running after upgrade to mocha 0.12.2.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10155 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-02 17:37:03 +00:00
f50da1593e
Gemfile: prevent "rake db:migrate RAILS_ENV=test" causes exception on Ruby 1.9.3 ( #10320 , #10818 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10137 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 02:32:40 +00:00
6a2ca5e034
JQuery in, Prototype/Scriptaculous out ( #11445 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-22 13:29:26 +00:00
c804151780
Upgrade to Rails 3.2.6 ( #11162 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9830 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-14 10:33:30 +00:00
1c5b214056
Upgrade to Rails 3.2.5 ( #11084 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-03 13:16:16 +00:00
ae8830ed61
Added yard to development gems.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-18 13:52:49 +00:00
d2278b63a1
Fixed path for loading plugin Gemfile ( #10811 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9614 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-02 16:20:32 +00:00
5909b00a46
Gemfile: pin shoulda version
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9555 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-27 22:52:05 +00:00
79091382cc
Removed tzinfo gem requirement.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9535 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-26 18:28:41 +00:00
5e57a1a9d9
Merged rails-3.2 branch.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
b960470d78
Removed object_daddy dependency.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9469 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-22 11:56:47 +00:00
b3bddcd31f
Load Gemfile.local with absolute path.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9450 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-19 09:22:55 +00:00
dd8d8e0560
Updated CodeRay to 1.0.6.
...
Fixed multiline comments highlighting issue in file view (#7495 ).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9389 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-12 17:54:55 +00:00
6d62ab64e6
Upgrade required pg gem ( #6941 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9374 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-08 21:10:02 +00:00
2658730302
Load Gemfile.local if present.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9346 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 11:12:50 +00:00
7d458e0b27
Do not install rmagick gem with jruby.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9341 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 10:26:55 +00:00
fec3e6c84b
Fixed: ruby 1.9.3 Time Zone setting Internal error ( #10442 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-17 12:49:47 +00:00
cd9412fe52
Upgrade to net-ldap 0.3.1 ( #10272 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-19 15:05:20 +00:00
Toshi MARUYAMA
Jean-Philippe Lang
Etienne Massip