Commit Graph

290 Commits

Author SHA1 Message Date
Jean-Philippe Lang
d74f0bfd5c Merged rails-5.1 branch (#23630).
git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-23 11:26:04 +00:00
Jean-Philippe Lang
dc05c52e5a Ruby 1.9.3 no longer supported (#25538).
git-svn-id: http://svn.redmine.org/redmine/trunk@16778 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-08 16:33:37 +00:00
Jean-Philippe Lang
2bc719e2c8 LdapError is deprecated (#24970).
git-svn-id: http://svn.redmine.org/redmine/trunk@16773 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-08 13:46:47 +00:00
Jean-Philippe Lang
21e00bfdbf Use latest simplecov gem (#26322).
git-svn-id: http://svn.redmine.org/redmine/trunk@16772 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-08 13:25:57 +00:00
Jean-Philippe Lang
02a8442701 Use Nokogiri 1.7.2 if possible (#26183).
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@16676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 10:48:32 +00:00
Jean-Philippe Lang
2407bcba29 Reverts r16666 that prevents Redmine to start.
[!] There was an error parsing `Gemfile`: uninitialized constant Bundler::Dsl::R
edmine. Bundler cannot continue.

git-svn-id: http://svn.redmine.org/redmine/trunk@16669 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 07:50:01 +00:00
Jean-Philippe Lang
f9ed43ee15 Change plugins directory through the configuration.yml file (#24007, #26139).
Patch by Sho HASHIMOTO

git-svn-id: http://svn.redmine.org/redmine/trunk@16666 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 07:31:23 +00:00
Toshi MARUYAMA
4ef5303b66 Gemfile: ping roadie version 3.2 to prevent decadency failure on CI server Ruby 2.1
git-svn-id: http://svn.redmine.org/redmine/trunk@16611 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-06 03:41:42 +00:00
Toshi MARUYAMA
36c7c97345 Markdown: Upgrade redcarpet gem to 3.4 (#25781)
git-svn-id: http://svn.redmine.org/redmine/trunk@16583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-30 17:06:57 +00:00
Toshi MARUYAMA
418ad8b2ba Gemfile: pin test_after_commit version 0.4 (#25794)
test_after_commit >= 0.5 requires Ruby >= 2.0.0

git-svn-id: http://svn.redmine.org/redmine/trunk@16582 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-30 14:00:54 +00:00
Jean-Philippe Lang
9439cae70f Send journal notification after commit (#25794).
git-svn-id: http://svn.redmine.org/redmine/trunk@16573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-27 08:44:24 +00:00
Jean-Philippe Lang
b3ac4a6295 Use mysql2 0.4.6 instead of 0.3 (#25829).
Patch by Pavel Rosický.

git-svn-id: http://svn.redmine.org/redmine/trunk@16553 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-13 09:28:46 +00:00
Toshi MARUYAMA
31039a6578 Gemfile: pin roadie-rails version 1.1 (#25807)
git-svn-id: http://svn.redmine.org/redmine/trunk@16546 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-05-10 11:54:27 +00:00
Jean-Philippe Lang
e4fac91b7d Use rbpdf 1.19.2 (#22335, #24271).
git-svn-id: http://svn.redmine.org/redmine/trunk@16520 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-08 07:33:25 +00:00
Toshi MARUYAMA
f2afa28d46 Gemfile: remove jruby definitions
git-svn-id: http://svn.redmine.org/redmine/trunk@16517 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-06 22:10:27 +00:00
Toshi MARUYAMA
1553996412 Gemfile: pin sqlite3 1.3.12 on Windows Ruby 1.9.3
git-svn-id: http://svn.redmine.org/redmine/trunk@16516 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-06 22:10:15 +00:00
Toshi MARUYAMA
42331405da Gemfile: pin ffi 1.9.14 on Windows Ruby 1.9.3
git-svn-id: http://svn.redmine.org/redmine/trunk@16515 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-06 21:45:20 +00:00
Jean-Philippe Lang
2dfec42484 Reverts to rbpdf 1.19.0 for now.
Using rbpdf-font 1.19.1

Encoding::UndefinedConversionError: "\x81" to UTF-8 in conversion from Windows-1
252 to UTF-8
An error occurred while installing rbpdf (1.19.1), and Bundler cannot continue.
Make sure that `gem install rbpdf -v '1.19.1'` succeeds before bundling.

git-svn-id: http://svn.redmine.org/redmine/trunk@16507 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-06 17:16:36 +00:00
Toshi MARUYAMA
150380ed58 Gemfile: explicitly use rbpdf 1.19.1 (#22335, #24271)
git-svn-id: http://svn.redmine.org/redmine/trunk@16485 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-05 10:53:44 +00:00
Toshi MARUYAMA
b021eb648d remove trailing white space from Gemfile
git-svn-id: http://svn.redmine.org/redmine/trunk@16484 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-04-05 10:53:33 +00:00
Jean-Philippe Lang
df90907dc7 Ruby 2.4: Fixed "Fixnum is deprecated" warning of nokogiri (#25048).
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@16353 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-03-02 22:47:36 +00:00
Toshi MARUYAMA
dcc216002d upgrade Rails to 4.2.8 (#25048)
Ruby 2.4 tests fail.

git-svn-id: http://svn.redmine.org/redmine/trunk@16340 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-02-23 02:31:08 +00:00
Toshi MARUYAMA
64c6779eaa Gemfile: pin i18n version 0.7.0
i18n 0.8.0 causes error.

<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
    lib/redmine/i18n.rb:58:in `ll'
    lib/redmine/i18n.rb:122:in `block in languages_options'
    lib/redmine/i18n.rb:122:in `map'
    lib/redmine/i18n.rb:122:in `languages_options'
    test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@16324 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-02-02 05:41:57 +00:00
Toshi MARUYAMA
5a86f95d29 revert r16322 (#24970)
Some tests fail.

git-svn-id: http://svn.redmine.org/redmine/trunk@16323 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-02-02 03:01:19 +00:00
Toshi MARUYAMA
d37125dfe9 replace depricated Net::LDAP::LdapError by Net::LDAP::Error (#24970)
git-svn-id: http://svn.redmine.org/redmine/trunk@16322 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-02-02 02:24:50 +00:00
Toshi MARUYAMA
fa286638f2 Gemfile: remove builder (#24924)
Rails 4.2.7.1 has 'builder', '~> 3.1'.
https://github.com/rails/rails/blob/v4.2.7.1/actionview/actionview.gemspec#L24

git-svn-id: http://svn.redmine.org/redmine/trunk@16264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-01-27 04:21:11 +00:00
Toshi MARUYAMA
72f5919252 Gemfile: pin nokogiri version 1.6
nokogiri 1.7.0.1 requires Ruby version >= 2.1.0.

git-svn-id: http://svn.redmine.org/redmine/trunk@16167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-01-09 15:21:51 +00:00
Jean-Philippe Lang
f3068cd37a Use tiny_tds 0.7 for ruby < 2.0 (#23932).
git-svn-id: http://svn.redmine.org/redmine/trunk@16061 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-12-11 15:30:39 +00:00
Jean-Philippe Lang
1d7127a408 Use tiny_tds 1.0.5 (#23932).
git-svn-id: http://svn.redmine.org/redmine/trunk@16058 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-12-11 10:09:46 +00:00
Toshi MARUYAMA
410dcc5084 Gemfile: pin rdoc version 4
rdoc version 5.0.0 requires RubyGems version >= 2.2.

git-svn-id: http://svn.redmine.org/redmine/trunk@15945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-11-05 17:26:12 +00:00
Toshi MARUYAMA
a06bf8a6bd Gemfile: pin addressable 2.4.0 if Ruby is 1.9.3
git-svn-id: http://svn.redmine.org/redmine/trunk@15944 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-11-05 16:53:50 +00:00
Jean-Philippe Lang
c91a4391d3 Set https back.
git-svn-id: http://svn.redmine.org/redmine/trunk@15916 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-10-20 17:49:24 +00:00
Jean-Philippe Lang
15460450bb Use selenium-webdriver 2.
git-svn-id: http://svn.redmine.org/redmine/trunk@15915 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-10-20 17:49:05 +00:00
Toshi MARUYAMA
f710d594e3 upgrade Rails to 4.2.7.1
git-svn-id: http://svn.redmine.org/redmine/trunk@15734 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-08-12 04:12:22 +00:00
Jean-Philippe Lang
d4edd4d6a4 Removes action caching on /robots.txt.
git-svn-id: http://svn.redmine.org/redmine/trunk@15633 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-07-10 20:34:37 +00:00
Jean-Philippe Lang
140eb72cc1 Update CodeRay to v1.1.1 (#23107).
git-svn-id: http://svn.redmine.org/redmine/trunk@15569 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-06-19 07:04:44 +00:00
Jean-Philippe Lang
bf81c96b79 Make sure we only invoke Imagemagick if this is actually an image (#22721).
git-svn-id: http://svn.redmine.org/redmine/trunk@15362 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-05-04 18:05:54 +00:00
Jean-Philippe Lang
f2eb979f66 Upgrade to Rails 4.2.6.
git-svn-id: http://svn.redmine.org/redmine/trunk@15334 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-04-16 06:16:24 +00:00
Toshi MARUYAMA
6d10433732 Gemfile: switch mime-types version by Ruby >= 2.0 or not
git-svn-id: http://svn.redmine.org/redmine/trunk@15274 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-24 05:20:26 +00:00
Toshi MARUYAMA
483cde9bb2 Gemfile: update Rails to 4.2.5.2
git-svn-id: http://svn.redmine.org/redmine/trunk@15161 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-02 04:06:11 +00:00
Toshi MARUYAMA
4f7f7b2824 request at least rails-html-sanitizer 1.0.3 because of security advisories
git-svn-id: http://svn.redmine.org/redmine/trunk@15105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 11:06:12 +00:00
Toshi MARUYAMA
910adf5cfe update Rails to 4.2.5.1
git-svn-id: http://svn.redmine.org/redmine/trunk@15103 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 10:54:20 +00:00
Toshi MARUYAMA
1c335d756d fix nokogiri version comment (#21843)
git-svn-id: http://svn.redmine.org/redmine/trunk@15099 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 04:26:10 +00:00
Toshi MARUYAMA
cc07bebd08 Request at least nokogiri 1.6.7.2 because of security advisories (#21843)
git-svn-id: http://svn.redmine.org/redmine/trunk@15096 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 03:51:06 +00:00
Jean-Philippe Lang
5ab9e10e7a Request at least nokogiri 1.6.7.1 because of security advisories (#21569).
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@14977 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 07:57:00 +00:00
Toshi MARUYAMA
63fcdb1e58 pdf: upgrade rbpdf to 1.19.0 (#19017)
Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/trunk@14908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-04 05:42:25 +00:00
Toshi MARUYAMA
5f73be7bb6 update Rails to 4.2.5
git-svn-id: http://svn.redmine.org/redmine/trunk@14884 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-25 03:55:27 +00:00
Toshi MARUYAMA
9c85a341ca update rbpdf version to 1.18.7 (#20591, #20811)
git-svn-id: http://svn.redmine.org/redmine/trunk@14813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 11:02:35 +00:00
Toshi MARUYAMA
7019f3416a upgrade net-ldap gem to 0.12.0 (#17618)
git-svn-id: http://svn.redmine.org/redmine/trunk@14784 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-31 14:48:26 +00:00
Toshi MARUYAMA
a98cad3a83 upgrade net-ldap gem to 0.10.1 (#17618)
git-svn-id: http://svn.redmine.org/redmine/trunk@14783 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-31 14:48:14 +00:00