Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-05 21:35:30 +02:00
Code Issues Packages Projects Releases Activity
11,160 Commits 35 Branches 228 Tags
f934915b32aedaa3ff8d7c6fb4635896ecd40861
Commit Graph

121 Commits

Author SHA1 Message Date
Toshi MARUYAMA
0cac2b85b3 Merged r14360 from trunk to 2.6-stable (#20142) 
update Gemfile to require rbpdf ~>1.18.6.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14362 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 09:51:52 +00:00
Toshi MARUYAMA
faf5baeff5 Merged r14329 from trunk to 2.6-stable (#19252) 
Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.

sqlite-jdbc was updated to 3.8.10.1 in upstream.
f7a20b0d57

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14331 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-18 07:16:44 +00:00
Toshi MARUYAMA
6f01582c61 Merged r14323 from trunk to 2.6-stable. 
Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 13:59:02 +00:00
Toshi MARUYAMA
1bff868f6d 2.6-stable: Gemfile: update Rails to 3.2.22 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14320 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 11:09:36 +00:00
Toshi MARUYAMA
0aaf7ab765 2.6-stable: Gemfile: add gems to test group for Ruby 2.2 (#19652) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14181 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-17 09:57:53 +00:00
Toshi MARUYAMA
88c186c423 Merged r14175 from trunk to 2.6-stable (#19252) 
Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8.

r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14177 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 12:58:10 +00:00
Toshi MARUYAMA
3a729e2a37 Merged r14167 from trunk to 2.6-stable 
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/branches/2.6-stable@14169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 05:35:57 +00:00
Toshi MARUYAMA
9cf6baf270 Merged r14118 from trunk to 2.6-stable 
Gemfile: remove "ffi"

ffi 1.9.7 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-81405252

r14118 comment has typo, problem version is not 1.9.6, it is 1.9.7.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14127 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 23:14:51 +00:00
Toshi MARUYAMA
f26f5fd101 Merged r14078 and r14097 from trunk to 2.6-stable 
Building ffi 1.9.7 fails in Ubuntu.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14099 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 16:37:15 +00:00
Toshi MARUYAMA
0c1a287696 Merged r13943 from trunk to 2.6-stable (#18632) 
require rbpdf 1.18.5.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13987 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-08 12:23:30 +00:00
Toshi MARUYAMA
e32a98cbc9 Merged r13870 from trunk to 2.6-stable (#18629) 
Gemfile: update rbpdf version to 1.18.4.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13871 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 04:22:53 +00:00
Jean-Philippe Lang
0c78d2cd8c Merged r13861 and r13862 (#18789). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 21:12:07 +00:00
Toshi MARUYAMA
6dea2fb61a 2.6-stable: Gemfile: pin pg version 0.17 on all platforms 
2.6-stable uses Rails 3.2 and passes test described at trunk r13839.
But this revision prevents unexpected changes due to pg version change.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13840 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 07:42:05 +00:00
Toshi MARUYAMA
6034757312 2.6-stable: Gemfile: simplify rmagick version definition 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 02:57:11 +00:00
Toshi MARUYAMA
2365736876 2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install error 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13832 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 02:57:03 +00:00
Toshi MARUYAMA
6116344f8e Merged r13829 from trunk to 2.6-stable. 
Gemfile: pin activerecord-jdbcsqlite3-adapter version 1.3.11.

1.3.13 breaks test/functional/issues_controller_test.rb.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13830 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 16:23:53 +00:00
Toshi MARUYAMA
6e6b45eb25 2.6-stable: Gemfile: pin i18n version 0.6 on all platforms 
i18n 0.7 is installed on jruby.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13828 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 16:04:55 +00:00
Toshi MARUYAMA
4107e5619e 2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2 
i18n 0.7 requires Ruby version >= 1.9.3

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13816 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 14:57:46 +00:00
Toshi MARUYAMA
ede61fa9c7 2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ruby 1.8.7 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 14:35:30 +00:00
Toshi MARUYAMA
672dbf418e 2.6-stable: Gemfile: update Rails to 3.2.21 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 11:13:57 +00:00
Toshi MARUYAMA
f716688eef 2.6-stable: Gemfile: update Rails to 3.2.20 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13530 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-31 04:15:01 +00:00
Toshi MARUYAMA
83d55b40af Merged r13506 from trunk to 2.6-stable (#18176) 
Gemfile: update rbpdf to version 1.18.2.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13507 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 07:39:41 +00:00
Jean-Baptiste Barth
e632a79d59 Add a constraint on "shoulda-matchers" version (#17828). 
This helps bundler find its dependencies in case shoulda-matchers v1.4.2 is
already installed. In such a case bundler breaks while it shouldn't.


git-svn-id: http://svn.redmine.org/redmine/trunk@13411 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 21:17:29 +00:00
Toshi MARUYAMA
a614678835 Gemfile: update rbpdf version to 1.18.1 (#17570) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13409 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 02:18:48 +00:00
Toshi MARUYAMA
cc688bb1b1 Backport r13313 from rails-4.1 to trunk. 
Upgrade to JQuery 1.11.1

git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 14:17:52 +00:00
Toshi MARUYAMA
4a9210d86f use rbpdf gem instead of bundled rfpdf (#17570) 
Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/trunk@13358 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-28 10:23:46 +00:00
Jean-Baptiste Barth
81f165966e Add ability to define plugins' gem dependencies in PluginGemfile (#14030). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13337 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-13 09:07:34 +00:00
Jean-Philippe Lang
dd11d70eb9 Moved #link_to_version to ApplicationHelper (#17431). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13322 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 10:35:10 +00:00
Toshi MARUYAMA
5d07f5884f Gemfile: update Rails 3.2.19 
git-svn-id: http://svn.redmine.org/redmine/trunk@13208 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-03 22:36:38 +00:00
Toshi MARUYAMA
e85044d4d9 Gemfile: update builder version >= 3.0.4 (#17309) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13196 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-30 13:35:41 +00:00
Toshi MARUYAMA
8ee6495978 Gemfile: pin request_store version 1.0.5 (#16685) 
Many integration tests are broken.

git-svn-id: http://svn.redmine.org/redmine/trunk@13181 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-12 11:43:30 +00:00
Toshi MARUYAMA
1a74bf6485 Gemfile: upgrade sqlserver tiny_tds to 0.6.2 (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13152 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 12:04:47 +00:00
Toshi MARUYAMA
e06de47234 Gemfile: update Rails 3.2.18 
git-svn-id: http://svn.redmine.org/redmine/trunk@13130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-07 07:55:53 +00:00
Toshi MARUYAMA
9875ed9954 Gemfile: upgrade mocha version (#16685) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13117 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 11:44:06 +00:00
Toshi MARUYAMA
4276fc306c Gemfile: use double quote for request_store (#16685) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13112 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 01:50:40 +00:00
Toshi MARUYAMA
a599442d05 introduce request_store to ensure that the current user doesn't leak across request boundaries (#16685) 
Contributed by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@13110 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 00:44:01 +00:00
Toshi MARUYAMA
e4cf210fa2 use bundled awesome_nested_set (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13008 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-26 01:47:31 +00:00
Toshi MARUYAMA
291de3d03f Gemfile: pin rake version 10.1 
rake 10.2.0 requires Ruby version >= 1.9.

git-svn-id: http://svn.redmine.org/redmine/trunk@13001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-25 07:14:34 +00:00
Toshi MARUYAMA
4dc7bc75b4 update Rails to 3.2.17 
git-svn-id: http://svn.redmine.org/redmine/trunk@12906 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-19 09:32:51 +00:00
Toshi MARUYAMA
9e71d89cdb Gemfile: use awesome_nested_set 2.1.6 gem 
git-svn-id: http://svn.redmine.org/redmine/trunk@12734 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-27 06:48:38 +00:00
Jean-Philippe Lang
e1189c5335 Use the mime-types gem for getting mime types from filenames (#15790). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12483 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-05 16:35:59 +00:00
Jean-Philippe Lang
a657a12450 Don't load redcarpet with JRuby. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-23 17:07:51 +00:00
Jean-Philippe Lang
471e01ca50 Adds experimental support for Markdown formatting with redcarpet (#15520). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12452 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-23 13:05:10 +00:00
Toshi MARUYAMA
8a123b178c update Rails version 3.2.16 
git-svn-id: http://svn.redmine.org/redmine/trunk@12355 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-04 07:04:15 +00:00
Jean-Philippe Lang
bc0ec54afa Removed database_cleaner dependency (#15377). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-18 21:56:26 +00:00
Toshi MARUYAMA
b96941763d upgrade activerecord-jdbc-adapter to 1.3.2 
git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 16:44:44 +00:00
Jean-Philippe Lang
3661766edc Upgrade to Rails 3.2.15. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:51:00 +00:00
Toshi MARUYAMA
2e1f80dcde Gemfile: remove "i18n" 
activesupport 3.2.13 requires i18n 0.6.1 explicitly.
197b9f4d61

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 06:24:28 +00:00
Toshi MARUYAMA
56639689e0 back out r12241 (back out Rails version 3.2.13) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:45:44 +00:00
Toshi MARUYAMA
2cc413351a Gemfile: update Rails version 3.2.15 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:18:06 +00:00