Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-26 06:10:51 +01:00
Code Issues Packages Projects Releases Activity
12,679 Commits 35 Branches 228 Tags
4227d7a863dc110bce77d4c1ec052d75df6bec09
Commit Graph

172 Commits

Author SHA1 Message Date
Toshi MARUYAMA
75223ceb3d Merged r17116 from trunk to 3.3-stable (#27691) 
Gemfile: relax mail gem version.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17118 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-17 06:25:03 +00:00
Toshi MARUYAMA
9392fb59b6 Merged r17019 from trunk to 3.3-stable 
Gemfile: pin mail gem version to prevent failure of MailHandlerTest#test_add_issue_with_localized_attributes

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17021 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-05 19:40:41 +00:00
Toshi MARUYAMA
df1d0c2d58 3.3-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17015 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-19 15:52:15 +00:00
Toshi MARUYAMA
2382f016c8 3.3-stable: Gemfile: pin public_suffix if ruby < 2.1 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17012 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-17 15:07:59 +00:00
Toshi MARUYAMA
dbf042be28 Merged r16975 from trunk to 3.3-stable (#25702) 
Gemfile: update rbpdf version to 1.19.3.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16982 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-13 05:07:25 +00:00
Jean-Philippe Lang
9365fd97ef Merged r16676 (#26183). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16683 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:37:04 +00:00
Toshi MARUYAMA
c07a140f61 Merged r16611 from trunk to 3.3-stable. 
Gemfile: ping roadie version 3.2 to prevent decadency failure on CI server Ruby 2.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16613 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 05:15:16 +00:00
Jean-Philippe Lang
d06d0b1c39 Merged r16553 (#25829). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:32:59 +00:00
Toshi MARUYAMA
0c9cf4d445 Merged r16546 from trunk to 3.3-stable (#25807) 
Gemfile: pin roadie-rails version 1.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16547 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-10 12:26:42 +00:00
Jean-Philippe Lang
d47b673f9f Merged r16520 (#22335, #24271). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16530 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:14:53 +00:00
Toshi MARUYAMA
f3821dcbda Merged r16515 and r16516 from trunk to 3.3-stable 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16518 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-07 08:23:07 +00:00
Toshi MARUYAMA
1770a9360d Merged r16507 from trunk to 3.3-stable (#22335, #24271) 
Gemfile: use rbpdf 1.19.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16512 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 20:05:43 +00:00
Toshi MARUYAMA
f637a4e4ce Merged r16485 from trunk to 3.3-stable (#22335, #24271) 
Gemfile: explicitly use rbpdf 1.19.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16486 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 11:04:24 +00:00
Toshi MARUYAMA
b03982e1b7 Merged r16324 from trunk to 3.3-stable. 
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/branches/3.3-stable@16325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-02 07:27:16 +00:00
Toshi MARUYAMA
cb8aaf1974 Merged r16167 from trunk to 3.3-stable. 
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/branches/3.3-stable@16168 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-09 16:40:13 +00:00
Toshi MARUYAMA
1a37430858 Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.3-stable (#24092) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-05 18:08:38 +00:00
Toshi MARUYAMA
7a450e1b84 Merged r15734 from trunk to 3.3-stable. 
upgrade Rails to 4.2.7.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15735 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-12 04:36:55 +00:00
Jean-Philippe Lang
ee0d7ce7b9 Merged r15569 (#23107). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15570 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-19 08:38:46 +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
Jean-Philippe Lang
02e598e232 Updgrade to jquery-rails 3.1.4 (#20380). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14654 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 07:05:09 +00:00
Toshi MARUYAMA
f1ed7dc523 Gemfile: remove loofah definition (#16962, #19419) 
actionpack 4.2 depends on loofah.

git-svn-id: http://svn.redmine.org/redmine/trunk@14542 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-01 00:15:24 +00:00
Toshi MARUYAMA
0dc3c2fe1c add roadie-rails gem for e-mail inline styles (#8335, #20641) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14540 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 07:38:29 +00:00
Toshi MARUYAMA
be2332c1ee Gemfile: update Rails to 4.2.4 
git-svn-id: http://svn.redmine.org/redmine/trunk@14521 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 07:03:17 +00:00
Jean-Philippe Lang
f3345b8c19 Upgrades redcarpet gem to 3.3.2. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14480 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-10 07:11:35 +00:00
Toshi MARUYAMA
58a8130394 Gemfile: update Rails to 4.2.3 
git-svn-id: http://svn.redmine.org/redmine/trunk@14370 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-26 12:37:25 +00:00
Toshi MARUYAMA
c2eb531f7e update Gemfile to require rbpdf ~>1.18.6 (#20142) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14360 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 08:35:40 +00:00
Toshi MARUYAMA
d48146c386 Gemfile: use jdbc-sqlite3 version >= 3.8.10.1 (#19252) 
sqlite-jdbc was updated to 3.8.10.1 in upstream.
f7a20b0d57

git-svn-id: http://svn.redmine.org/redmine/trunk@14329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-18 07:10:49 +00:00
Toshi MARUYAMA
044554e267 Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14323 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 13:50:15 +00:00
Toshi MARUYAMA
f5a18db69e Gemfile: update Rails to 4.2.2 
git-svn-id: http://svn.redmine.org/redmine/trunk@14319 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 11:06:08 +00:00
Jean-Philippe Lang
3ae42cb326 Better handle html-only emails (#16962). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14313 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-15 21:16:42 +00:00
Toshi MARUYAMA
2f67c8e214 Gemfile: upgrade pg to 0.18.1 
git-svn-id: http://svn.redmine.org/redmine/trunk@14234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-01 16:30:26 +00:00
Toshi MARUYAMA
5a71c37f35 remove trailing white space from Gemfile 
git-svn-id: http://svn.redmine.org/redmine/trunk@14182 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-18 15:22:23 +00:00
Toshi MARUYAMA
b4a8adc147 Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8 (#19252) 
r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.

git-svn-id: http://svn.redmine.org/redmine/trunk@14175 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 12:49:37 +00:00
Toshi MARUYAMA
40c4682b5b upgrade rmagick to 2.14 
And replace deprecated requiring "RMagick" to "rmagick".

git-svn-id: http://svn.redmine.org/redmine/trunk@14170 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 05:38:14 +00:00
Toshi MARUYAMA
d3ca9f36fe Gemfile: pin rmagick version 2.13 
rmagick 2.14 prints
'[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'.

git-svn-id: http://svn.redmine.org/redmine/trunk@14167 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 04:50:43 +00:00
Toshi MARUYAMA
c8fb677a1f Gemfile: upgrade Rails version to 4.2.1 
git-svn-id: http://svn.redmine.org/redmine/trunk@14135 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 06:16:56 +00:00
Toshi MARUYAMA
8d121cbec1 Gemfile: remove "ffi" 
ffi 1.9.6 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-81405252

git-svn-id: http://svn.redmine.org/redmine/trunk@14118 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 04:42:29 +00:00