summaryrefslogtreecommitdiffstats
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merged r16676 (#26183).Jean-Philippe Lang2017-06-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16684 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16611 from trunk to 3.2-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.2-stable@16614 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.2-stable@16561 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16546 from trunk to 3.2-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.2-stable@16548 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.2-stable@16531 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16515 and r16516 from trunk to 3.2-stableToshi MARUYAMA2017-04-071-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16519 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16507 from trunk to 3.2-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.2-stable@16513 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16485 from trunk to 3.2-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.2-stable@16487 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16324 from trunk to 3.2-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.2-stable@16326 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16167 from trunk to 3.2-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.2-stable@16169 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.2-stable ↵Toshi MARUYAMA2016-11-051-2/+3
| | | | | | (#24092) git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15947 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.2-stable: upgrade Rails to 4.2.7.1Toshi MARUYAMA2016-08-121-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15736 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15362 (#22721).Jean-Philippe Lang2016-05-051-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15363 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15274 from trunk to 3.2-stableToshi MARUYAMA2016-03-241-1/+1
| | | | | | Gemfile: switch mime-types version by Ruby >= 2.0 or not git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15276 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15161 from trunk to 3.2-stableToshi MARUYAMA2016-03-021-1/+1
| | | | | | Gemfile: update Rails to 4.2.5.2 git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15162 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15105 from trunk to 3.2-stable.Toshi MARUYAMA2016-01-261-0/+3
| | | | | | request at least rails-html-sanitizer 1.0.3 because of security advisories. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15107 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15103 from trunk to 3.2-stable.Toshi MARUYAMA2016-01-261-1/+1
| | | | | | update Rails to 4.2.5.1. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15106 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15099 from trunk to 3.2-stable (#21843)Toshi MARUYAMA2016-01-261-1/+1
| | | | | | fix nokogiri version comment. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15100 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15096 from trunk to 3.2-stable (#21843)Toshi MARUYAMA2016-01-261-1/+1
| | | | | | Request at least nokogiri 1.6.7.2 because of security advisories. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15097 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14977 from trunk to 3.2-stable (#21569)Toshi MARUYAMA2015-12-211-0/+3
| | | | | | | | Request at least nokogiri 1.6.7.1 because of security advisories. Patch by Jan Schulz-Hofen. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14990 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14908, r14909 and r14910 from trunk to 3.2-stable (#19017)Toshi MARUYAMA2015-12-041-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14912 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
* upgrade rmagick to 2.14Toshi MARUYAMA2015-04-141-1/+1
| | | | | | And replace deprecated requiring "RMagick" to "rmagick". git-svn-id: http://svn.redmine.org/redmine/trunk@14170 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: pin rmagick version 2.13Toshi MARUYAMA2015-04-141-1/+1
| | | | | | | 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
* Gemfile: upgrade Rails version to 4.2.1Toshi MARUYAMA2015-03-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14135 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: remove "ffi"Toshi MARUYAMA2015-03-161-2/+0
| | | | | | | 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
* Gemfile: move "ffi" definition to :test groupToshi MARUYAMA2015-03-141-3/+2
| | | | | | | Depending: selenium-webdriver -> childprocess -> ffi git-svn-id: http://svn.redmine.org/redmine/trunk@14097 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Building ffi 1.9.7 fails in Ubuntu.Jean-Philippe Lang2015-03-141-0/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14078 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Require bundler >= 1.5.0 (#19172).Jean-Philippe Lang2015-03-081-0/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14065 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: remove mocha versionToshi MARUYAMA2015-01-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13947 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Require rbpdf 1.18.5 that is Rails 4.2 compatible (#14534).Jean-Philippe Lang2015-01-241-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13943 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fix migration and use Rails 4.2.0 release (#14534).Jean-Philippe Lang2015-01-181-2/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13894 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: use GitHub rails gemToshi MARUYAMA2015-01-181-1/+2
| | | | | | 20091114105931 AddViewIssuesPermission: db migrating fails on ruby 1.9.3p551 sqlite3 git-svn-id: http://svn.redmine.org/redmine/trunk@13893 e93f8b46-1217-0410-a6f0-8f06a7374b81