summaryrefslogtreecommitdiffstats
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Update Rails to 4.2.11 (#30043).Jean-Philippe Lang2018-11-281-1/+1
| | | | | | Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17647 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17574 from trunk to 3.3-stable (#28565).Go MAEDA2018-10-061-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17576 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17414 from trunk to 3.3-stable (#28125).Go MAEDA2018-06-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17416 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17405 from trunk to 3.3-stable (#28125).Go MAEDA2018-06-221-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17409 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17116 from trunk to 3.3-stable (#27691)Toshi MARUYAMA2017-12-171-1/+1
| | | | | | Gemfile: relax mail gem version. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17118 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17019 from trunk to 3.3-stableToshi MARUYAMA2017-11-051-0/+1
| | | | | | 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
* 3.3-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229)Toshi MARUYAMA2017-10-191-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17015 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.3-stable: Gemfile: pin public_suffix if ruby < 2.1Toshi MARUYAMA2017-10-171-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17012 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16975 from trunk to 3.3-stable (#25702)Toshi MARUYAMA2017-10-131-1/+1
| | | | | | 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
* Merged r16676 (#26183).Jean-Philippe Lang2017-06-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16683 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16611 from trunk to 3.3-stable.Toshi MARUYAMA2017-06-061-0/+1
| | | | | | 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
* Merged r16553 (#25829).Jean-Philippe Lang2017-05-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16546 from trunk to 3.3-stable (#25807)Toshi MARUYAMA2017-05-101-1/+1
| | | | | | 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
* Merged r16520 (#22335, #24271).Jean-Philippe Lang2017-04-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16530 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16515 and r16516 from trunk to 3.3-stableToshi MARUYAMA2017-04-071-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16518 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16507 from trunk to 3.3-stable (#22335, #24271)Toshi MARUYAMA2017-04-061-1/+1
| | | | | | Gemfile: use rbpdf 1.19.0. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16512 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16485 from trunk to 3.3-stable (#22335, #24271)Toshi MARUYAMA2017-04-051-1/+1
| | | | | | 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
* Merged r16324 from trunk to 3.3-stable.Toshi MARUYAMA2017-02-021-0/+1
| | | | | | | | | | | | | | | | | | 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
* Merged r16167 from trunk to 3.3-stable.Toshi MARUYAMA2017-01-091-2/+1
| | | | | | | | 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
* Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.3-stable ↵Toshi MARUYAMA2016-11-051-2/+3
| | | | | | (#24092) git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15946 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15734 from trunk to 3.3-stable.Toshi MARUYAMA2016-08-121-1/+1
| | | | | | 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
* Merged r15569 (#23107).Jean-Philippe Lang2016-06-191-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15570 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Make sure we only invoke Imagemagick if this is actually an image (#22721).Jean-Philippe Lang2016-05-041-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15362 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade to Rails 4.2.6.Jean-Philippe Lang2016-04-161-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15334 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: switch mime-types version by Ruby >= 2.0 or notToshi MARUYAMA2016-03-241-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15274 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update Rails to 4.2.5.2Toshi MARUYAMA2016-03-021-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15161 e93f8b46-1217-0410-a6f0-8f06a7374b81
* request at least rails-html-sanitizer 1.0.3 because of security advisoriesToshi MARUYAMA2016-01-261-0/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15105 e93f8b46-1217-0410-a6f0-8f06a7374b81
* update Rails to 4.2.5.1Toshi MARUYAMA2016-01-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15103 e93f8b46-1217-0410-a6f0-8f06a7374b81
* fix nokogiri version comment (#21843)Toshi MARUYAMA2016-01-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15099 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Request at least nokogiri 1.6.7.2 because of security advisories (#21843)Toshi MARUYAMA2016-01-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@15096 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Request at least nokogiri 1.6.7.1 because of security advisories (#21569).Jean-Philippe Lang2015-12-191-0/+3
| | | | | | Patch by Jan Schulz-Hofen. git-svn-id: http://svn.redmine.org/redmine/trunk@14977 e93f8b46-1217-0410-a6f0-8f06a7374b81
* pdf: upgrade rbpdf to 1.19.0 (#19017)Toshi MARUYAMA2015-12-041-1/+1
| | | | | | Contributed by Jun NAITOH. git-svn-id: http://svn.redmine.org/redmine/trunk@14908 e93f8b46-1217-0410-a6f0-8f06a7374b81
* update Rails to 4.2.5Toshi MARUYAMA2015-11-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14884 e93f8b46-1217-0410-a6f0-8f06a7374b81
* update rbpdf version to 1.18.7 (#20591, #20811)Toshi MARUYAMA2015-11-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14813 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade net-ldap gem to 0.12.0 (#17618)Toshi MARUYAMA2015-10-311-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14784 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade net-ldap gem to 0.10.1 (#17618)Toshi MARUYAMA2015-10-311-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14783 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updgrade to jquery-rails 3.1.4 (#20380).Jean-Philippe Lang2015-10-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14654 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: remove loofah definition (#16962, #19419)Toshi MARUYAMA2015-09-011-1/+0
| | | | | | actionpack 4.2 depends on loofah. git-svn-id: http://svn.redmine.org/redmine/trunk@14542 e93f8b46-1217-0410-a6f0-8f06a7374b81
* add roadie-rails gem for e-mail inline styles (#8335, #20641)Toshi MARUYAMA2015-08-311-0/+1
| | | | | | Contributed by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@14540 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update Rails to 4.2.4Toshi MARUYAMA2015-08-291-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14521 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrades redcarpet gem to 3.3.2.Jean-Philippe Lang2015-08-101-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14480 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update Rails to 4.2.3Toshi MARUYAMA2015-06-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14370 e93f8b46-1217-0410-a6f0-8f06a7374b81
* update Gemfile to require rbpdf ~>1.18.6 (#20142)Toshi MARUYAMA2015-06-211-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14360 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: use jdbc-sqlite3 version >= 3.8.10.1 (#19252)Toshi MARUYAMA2015-06-181-1/+1
| | | | | | | sqlite-jdbc was updated to 3.8.10.1 in upstream. https://github.com/jruby/activerecord-jdbc-adapter/commit/f7a20b0d577fad569d6f375d3b8f1e63dd02266b git-svn-id: http://svn.redmine.org/redmine/trunk@14329 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)Toshi MARUYAMA2015-06-171-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14323 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update Rails to 4.2.2Toshi MARUYAMA2015-06-171-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14319 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Better handle html-only emails (#16962).Jean-Philippe Lang2015-06-151-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14313 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: upgrade pg to 0.18.1Toshi MARUYAMA2015-05-011-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14234 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white space from GemfileToshi MARUYAMA2015-04-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14182 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin ↵Toshi MARUYAMA2015-04-141-1/+2
| | | | | | | | 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