meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity
10,915 Commits 32 Branches 194 Tags
Commit Graph

10915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
c1f17037e4 fix variable name confusion at AttachmentsController#thumbnail 
This is suggested by Rails team.
https://github.com/rails/rails/issues/15471#issuecomment-45419147

git-svn-id: http://svn.redmine.org/redmine/trunk@13176 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-08 04:23:59 +00:00
Toshi MARUYAMA
80ba11a029 add test of attachment thumbnail etag 
git-svn-id: http://svn.redmine.org/redmine/trunk@13175 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-08 04:01:28 +00:00
Toshi MARUYAMA
dfa40b732e add test of attachment download etag 
git-svn-id: http://svn.redmine.org/redmine/trunk@13174 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-02 17:03:08 +00:00
Toshi MARUYAMA
ebb1a0092f use with_settings at AttachmentsControllerTest#test_show_text_file_should_send_if_too_big 
git-svn-id: http://svn.redmine.org/redmine/trunk@13173 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-02 17:02:53 +00:00
Toshi MARUYAMA
be33ac6fc0 add missing fixture to ApplicationHelperTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13172 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-02 17:02:38 +00:00
Toshi MARUYAMA
fe181c1f55 pass PatchesTest on Rails 4.0.5 (#16194) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13171 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-25 15:56:13 +00:00
Toshi MARUYAMA
bbaccc347b fix ProjectsHelperTest fails when config.threadsafe! is enabled (#12097) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13170 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-25 14:38:12 +00:00
Toshi MARUYAMA
d0c741c88c remove redundant empty lines from app/models/auth_source_ldap.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-25 14:37:56 +00:00
Jean-Philippe Lang
b189d85dde Remove useless settings when editing a query from the gantt (#16747). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13168 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 17:01:16 +00:00
Jean-Philippe Lang
cf4af2c5db Fixed: unable to clear value for list custom field with multiple values and checkboxes style (#16798). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13167 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:53:33 +00:00
Jean-Philippe Lang
96baa905bf Fixed "column specified more than once" error with SQLServer (#6579). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13153 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:09:04 +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
Jean-Philippe Lang
e5e291b377 Adds a custom message for when a syntax error occurs (#16878). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13151 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:53:31 +00:00
Jean-Philippe Lang
169711bf46 Parse configuration file for ERB (#16878). 
Patch by Gavin Dunne.

git-svn-id: http://svn.redmine.org/redmine/trunk@13150 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:51:13 +00:00
Jean-Philippe Lang
8aeab43247 Count users with a single query on group list (#16905). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:41:13 +00:00
Toshi MARUYAMA
cdf9cae4a2 awesome_nested_set: not use cache for max rgt (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13148 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:18:05 +00:00
Toshi MARUYAMA
b4c903c035 remove awesome_nested_set patch from config/initializers/10-patches.rb (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13147 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:17:50 +00:00
Toshi MARUYAMA
0ee42898da awesome_nested_set: add lib/plugins/awesome_nested_set/init.rb (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13146 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:17:35 +00:00
Toshi MARUYAMA
9ea1ae48db awesome_nested_set: import git 2-1-stable branch revision 8eaab19868f326 (#6579) 
https://github.com/collectiveidea/awesome_nested_set/commit/8eaab19868f326

git-svn-id: http://svn.redmine.org/redmine/trunk@13145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:17:18 +00:00
Toshi MARUYAMA
e22c5c3f80 awesome_nested_set: import git 2-1-stable branch revision 3d5ac746542b564 (#6579) 
https://github.com/collectiveidea/awesome_nested_set/commit/3d5ac746542b564

git-svn-id: http://svn.redmine.org/redmine/trunk@13144 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:16:58 +00:00
Toshi MARUYAMA
43e84c6c10 awesome_nested_set: import git 2-1-stable branch revision 606847769 (#6579) 
https://github.com/collectiveidea/awesome_nested_set/commit/606847769

git-svn-id: http://svn.redmine.org/redmine/trunk@13143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:16:38 +00:00
Toshi MARUYAMA
5368af4847 replace tabs to spaces (#16795) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:15:43 +00:00
Jean-Philippe Lang
c74925d4af Fixed that custom field referencing deleted value trigger an error on display (#16926). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13141 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:12:40 +00:00
Jean-Philippe Lang
1fd5346c3c Fixed that Member#destroy triggers after_destroy callbacks twice (#16795). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 09:55:39 +00:00
Jean-Baptiste Barth
1914d1a159 Improve performance of Principal.member_of scope 
The 'join' turns to be slow for large numbers of members (>20k). Using a
sub-query like in Principal.not_member_of is more efficient and performance
is the same for smaller values.


git-svn-id: http://svn.redmine.org/redmine/trunk@13139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-19 21:17:55 +00:00
Toshi MARUYAMA
eaac0eff08 add support for pop3s (SSL) to redmine📧receive_pop3 (#16707) 
Contributed by Eric Davis.

git-svn-id: http://svn.redmine.org/redmine/trunk@13138 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-16 08:28:52 +00:00
Toshi MARUYAMA
6080a4cae3 gantt: completed percent truncated instead of rounded (#14737) 
Contributed by Jérôme BATAILLE.

git-svn-id: http://svn.redmine.org/redmine/trunk@13137 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-16 08:28:36 +00:00
Toshi MARUYAMA
4b0f418c80 split method for scm test repository extracting (#16881) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13136 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-14 06:10:37 +00:00
Toshi MARUYAMA
1c60fc0655 add :environment to test:scm:setup:create_dir and test:scm:update rake tasks (#16881) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13135 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-14 06:10:23 +00:00
Toshi MARUYAMA
868e15ff2d remove unneeded trailing ';' from lib/redmine/export/pdf.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13132 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-07 08:25:15 +00:00
Toshi MARUYAMA
1944473eee remove unneeded trailing ';' from test/functional/repositories_git_controller_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13131 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-07 08:25:00 +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
a87cc86b99 fix typo of app/models/repository/mercurial.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13129 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-03 23:21:01 +00:00
Toshi MARUYAMA
6eaba1137a fix typo of app/models/repository/cvs.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13128 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-03 23:20:45 +00:00
Jean-Philippe Lang
ef4cacdb66 Repository identifiers can be reserved words (#16564). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13127 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 08:09:33 +00:00
Jean-Philippe Lang
53deb6ca88 Mailer.token_for generates invalid message_id when using from address with full name (#16619). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13126 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 07:56:11 +00:00
Jean-Philippe Lang
61776a8b7e Blank content type for attachments attached via Ajax file upload (Patch by Jens Krämer). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13125 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 07:38:04 +00:00
Jean-Philippe Lang
382ca5055a Field set as read-only still available in the issues list context menu (#16755). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13124 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 07:32:41 +00:00
Jean-Philippe Lang
2d3f3cd9aa Use async email deliveries in rake tasks (#16784). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13123 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 07:07:02 +00:00
Jean-Philippe Lang
bcc5ac38f3 Crash in markdown formatter causes ruby process to end (#16781). 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13122 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-02 06:57:29 +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
6b33956394 use rvm 2.0 and 2.1 instead of 2.0.0 and 2.1.0 at .travis.yml 
See:
https://github.com/travis-ci/travis-ci/issues/2220

git-svn-id: http://svn.redmine.org/redmine/trunk@13116 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 01:59:55 +00:00
Toshi MARUYAMA
82fa2cf79a add patch for regression of Hash#reject in Ruby 2.1.1 (#16194) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13115 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 01:59:39 +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
Jean-Philippe Lang
9fdd0862f7 Missing type=array attributes in custom fields API (#16739). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13109 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-26 07:56:00 +00:00
Jean-Philippe Lang
ddd6ac8cd4 Don't submit the form when tabs are inside a form (#16708). 
Patch by Nicolas Rodriguez.

git-svn-id: http://svn.redmine.org/redmine/trunk@13108 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-26 07:48:28 +00:00
Jean-Philippe Lang
613757a83d Support for the 1.x versions of mime-types gem (#16710). 
Patch by Szilveszter Ördög.

git-svn-id: http://svn.redmine.org/redmine/trunk@13107 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-26 07:44:06 +00:00
Jean-Philippe Lang
a4fa0364d4 Redmine links not working with html escpaed characters (#16668). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13106 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-26 07:34:11 +00:00
Jean-Philippe Lang
d197203d79 Set Redcarpet :no_intra_emphasis to true (#16669). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13105 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-26 07:02:45 +00:00