Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity
15,598 Commits 35 Branches 222 Tags
5873af5ae32cf901071738efb8decadc0e9428c0
Commit Graph

290 Commits

Author SHA1 Message Date
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
Toshi MARUYAMA
50a8bd452b Gemfile: move "ffi" definition to :test group 
Depending:
selenium-webdriver -> childprocess -> ffi

git-svn-id: http://svn.redmine.org/redmine/trunk@14097 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 16:30:13 +00:00
Jean-Philippe Lang
38daed8b4e Building ffi 1.9.7 fails in Ubuntu. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14078 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 08:10:23 +00:00
Jean-Philippe Lang
f2d9af6dc3 Require bundler >= 1.5.0 (#19172). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14065 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:49:27 +00:00
Toshi MARUYAMA
b3fdc1ca8b Gemfile: remove mocha version 
git-svn-id: http://svn.redmine.org/redmine/trunk@13947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-25 10:44:29 +00:00
Jean-Philippe Lang
3a7847c785 Require rbpdf 1.18.5 that is Rails 4.2 compatible (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13943 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-24 21:39:47 +00:00
Jean-Philippe Lang
5190fef9d6 Fix migration and use Rails 4.2.0 release (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13894 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 09:04:21 +00:00
Toshi MARUYAMA
73762a7d62 Gemfile: use GitHub rails gem 
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
 2015-01-18 05:56:17 +00:00
Jean-Philippe Lang
d85f73a30d Upgrade to Rails 4.2.0 (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 17:02:55 +00:00
Toshi MARUYAMA
34b3376b81 Gemfile: update rbpdf version to 1.18.4 (#18629) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13870 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 04:19:33 +00:00
Jean-Philippe Lang
aca5bfdc05 Unlock capybara gem version (#18789). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13862 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:26:09 +00:00
Jean-Philippe Lang
1a851318fd Replaces awesome_nested_set gem with a simple and more robust implementation of nested sets. 
The concurrency tests added in this commit trigger dead locks and/or nested set inconsistency with awesome_nested_set.

git-svn-id: http://svn.redmine.org/redmine/trunk@13841 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 20:19:49 +00:00
Toshi MARUYAMA
bf5d58a768 Gemfile: pin pg version 0.17 
On Rails 4.1.8, pg 0.18.0 cause error.

<pre>
  1) Failure:
WikiContentTest#test_update_with_gzipped_history [test/unit/wiki_content_test.rb:88]:
Expected: "gzip"
  Actual: ""
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13839 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 07:31:41 +00:00
Toshi MARUYAMA
9da6bb31c1 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/trunk@13829 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 16:18:31 +00:00
Jean-Philippe Lang
6c6ea394af XML parameters parser extracted to actionpack-xml_parser gem in Rails 4 (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13790 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-22 13:41:15 +00:00
Toshi MARUYAMA
8caeb9f242 Gemfile: update rbpdf version to 1.18.3 (#16040, #18586, #10681) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13726 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-06 13:49:09 +00:00
Jean-Philippe Lang
c3ba302f0d Use simplecov for code coverage, rcov does not support ruby>=1.9. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13691 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-02 19:59:38 +00:00
Jean-Philippe Lang
f04148695a Drop shoulda. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13676 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-30 14:31:53 +00:00
Toshi MARUYAMA
107dd20c02 Gemfile: add :x64_mingw platform missing in r13651 
git-svn-id: http://svn.redmine.org/redmine/trunk@13654 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-26 04:39:20 +00:00
Toshi MARUYAMA
fcd02af27d Gemfile: add :x64_mingw platform (aka RubyInstaller x64) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-25 09:53:42 +00:00
Toshi MARUYAMA
09e62fbc68 Gemfile: update Rails to 4.1.8 
git-svn-id: http://svn.redmine.org/redmine/trunk@13611 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 10:59:43 +00:00
Toshi MARUYAMA
7e8afc960a Gemfile: update Rails to 4.1.7 
git-svn-id: http://svn.redmine.org/redmine/trunk@13529 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-31 04:01:59 +00:00
Toshi MARUYAMA
caccb57b55 Gemfile: update rbpdf to version 1.18.2 (#18176) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13506 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 07:09:20 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +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