meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity
11,422 Commits 32 Branches 194 Tags
Commit Graph

11422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
ae2dee14ef add tests to RepositoryCvsTest#test_entries_rev3 
git-svn-id: http://svn.redmine.org/redmine/trunk@13906 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:40:50 +00:00
Toshi MARUYAMA
8327f650c3 fix code indent at app/models/repository/cvs.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13905 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:40:42 +00:00
Toshi MARUYAMA
ad9fd2b66b use "where" instead of find_by_ at Repository::Cvs class 
git-svn-id: http://svn.redmine.org/redmine/trunk@13904 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:40:34 +00:00
Toshi MARUYAMA
2cc3ba063f revert r13901 
git-svn-id: http://svn.redmine.org/redmine/trunk@13903 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:27:31 +00:00
Jean-Philippe Lang
9915962356 Make sure that #scm_iconv returns a string with the target encoding (#14534). 
filechanges.find_by_revision_and_path fails with SQLite if arguments are not UTF-8 encoded.

git-svn-id: http://svn.redmine.org/redmine/trunk@13902 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:16:23 +00:00
Toshi MARUYAMA
6cc1f2be54 workaround unit cvs test failure on sqlite3 
git-svn-id: http://svn.redmine.org/redmine/trunk@13901 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:13:05 +00:00
Toshi MARUYAMA
e4a3fc50b2 svn propset svn:executable bin/ files 
git-svn-id: http://svn.redmine.org/redmine/trunk@13900 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 16:04:48 +00:00
Toshi MARUYAMA
3a1e7106f4 prevent "config.log_level" DEPRECATION WARNING 
DEPRECATION WARNING: You did not specify a `log_level` in `production.rb`.
Currently, the default value for `log_level` is `:info` for the production environment
and `:debug` in all other environments.
In Rails 5 the default value will be unified to `:debug` across all environments.
To preserve the current setting, add the following line to your `production.rb`:

   config.log_level = :info

git-svn-id: http://svn.redmine.org/redmine/trunk@13899 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 14:05:35 +00:00
Toshi MARUYAMA
4dfc0f04ad add missing fixture to Redmine::Hook::ManagerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13898 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 14:05:27 +00:00
Jean-Philippe Lang
93d270388b Prevents calling #truncate on nil. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13897 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 11:45:08 +00:00
Jean-Philippe Lang
0bcd5be0a5 Use attribute writers instead of before_create callback to normalize comments and committer (#14534). 
Unlike other adapters, SQLite raises Encoding::UndefinedConversionError before the callback that reencodes attributes is called.

git-svn-id: http://svn.redmine.org/redmine/trunk@13896 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 11:43:58 +00:00
Jean-Philippe Lang
886b9c14d0 Fixed that Redmine::Activity::Fetcher should consider activity provider permission option if given (#18832). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13895 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-18 09:07:42 +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
Jean-Philippe Lang
3ea8b70697 Missing fixtures. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13891 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:55:37 +00:00
Jean-Philippe Lang
471df16f9c Missing fixtures. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13890 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:55:17 +00:00
Jean-Philippe Lang
193bb9362d Missing fixtures. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13889 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:54:38 +00:00
Jean-Philippe Lang
a3a8fee8ad Send password reset email to the email used in lost password form (#4244). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13888 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:51:29 +00:00
Jean-Philippe Lang
14473f45a1 Adds strings to locales (#4244). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13887 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:17:58 +00:00
Jean-Philippe Lang
e3618bdbec Add support for multiple email addresses per user (#4244). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13886 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:14:12 +00:00
Toshi MARUYAMA
7f29c2fd88 IssuesControllerTest: make encoding tests independent of ordering (#18856) 
Contributed by Antonio Terceiro.

git-svn-id: http://svn.redmine.org/redmine/trunk@13885 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-16 04:57:10 +00:00
Toshi MARUYAMA
e7346625f0 fix UsersControllerTest failure randomly 
<pre>
  1) Error:
UsersControllerTest#test_show:
ActionView::Template::Error: undefined method `name' for nil:NilClass
    app/models/issue.rb:53:in `block in <class:Issue>'
    lib/plugins/acts_as_event/lib/acts_as_event.rb:62:in `call'
    lib/plugins/acts_as_event/lib/acts_as_event.rb:62:in `event_title'
    app/views/users/show.html.erb:57:in `block (2 levels) in _app_views_users_show_html_erb___2965700471773239267_46119700'
    app/views/users/show.html.erb:53:in `each'
    app/views/users/show.html.erb:53:in `block in _app_views_users_show_html_erb___2965700471773239267_46119700'
    app/views/users/show.html.erb:50:in `each'
    app/views/users/show.html.erb:50:in `_app_views_users_show_html_erb___2965700471773239267_46119700'
    app/controllers/users_controller.rb:75:in `block (2 levels) in show'
    app/controllers/users_controller.rb:71:in `show'
    test/functional/users_controller_test.rb:76:in `test_show'
</pre>

This can be reproduced with following change.

<pre>
   fixtures :users, :projects, :members, :member_roles, :roles,
            :custom_fields, :custom_values, :groups_users,
-           :auth_sources
+           :auth_sources,
+           :enabled_modules,
+           :issues, :issue_statuses
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13883 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 16:31:01 +00:00
Toshi MARUYAMA
d31ecd9ec2 Japanese translation updated by Go MAEDA (#18844) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13882 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 13:48:58 +00:00
Toshi MARUYAMA
a609c702c3 add missing fixture to SearchControllerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13881 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 13:38:44 +00:00
Toshi MARUYAMA
25c854b893 remove jruby-21mode from .travis.yml 
git-svn-id: http://svn.redmine.org/redmine/trunk@13880 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 13:38:36 +00:00
Toshi MARUYAMA
a5d9499dfa Japanese translation updated and changed by Go MAEDA (#18794) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13879 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 06:38:49 +00:00
Toshi MARUYAMA
19b9c7406b Traditional Chinese translation updated by ChunChang Lo (#18819) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13878 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 06:38:41 +00:00
Toshi MARUYAMA
1093e6773c generate i18n key (#10734) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13877 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 06:38:33 +00:00
Jean-Philippe Lang
062be16542 Updates for 2.6.1 release. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13874 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:15:24 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +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
a18c719fcc Fixed: Custom field is rendered, even if its value is empty (for multiple) (#18654). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13864 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 13:03:52 +00:00
Jean-Philippe Lang
a77d884157 Fixed: Redmine::FieldFormat::IntFormat does not accept "real" Integer values (#18781). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 11:06:27 +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
50ab0728a8 Time dependend failures in UI tests (#18789). 
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@13861 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:24:19 +00:00
Jean-Philippe Lang
b236be138d Fixed errors in UI tests (#18782). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13860 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:20:50 +00:00
Jean-Philippe Lang
a4499274a2 Fixed open div tag position. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13859 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:10:48 +00:00
Jean-Philippe Lang
0ed895388b Option to search open issues only (#10734). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13858 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:09:34 +00:00
Jean-Philippe Lang
6e94d2f2af Adds strings to locales (#4383). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13857 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-09 21:06:50 +00:00
Jean-Philippe Lang
576a13e99d Option to search attachment filenames and description (#4383). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13856 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-09 21:06:09 +00:00
Jean-Philippe Lang
742895183a Search custom fields and journals with different queries to take advantage of indexes on text columns if present. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13855 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-08 22:04:00 +00:00
Toshi MARUYAMA
e2e9d7185e replace tab to space at test/test_helper.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13854 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-08 06:20:32 +00:00
Jean-Philippe Lang
fec68fcfc1 Same fix as r13582 for trackers and statuses (#18769). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13853 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:56:34 +00:00
Jean-Philippe Lang
b1e105abe2 Redirect to the current page when reordering roles (#18769). 
Patch by Jérôme BATAILLE.

git-svn-id: http://svn.redmine.org/redmine/trunk@13852 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:52:23 +00:00
Jean-Philippe Lang
0eda7765fa Skip validation if attribute did not change. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13851 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:51:45 +00:00
Jean-Philippe Lang
e98e7c8c43 Missing break (#18734). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13850 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:45:11 +00:00
Jean-Philippe Lang
8db1cdd6f1 Deprecates Project#set_allowed_parent!. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13849 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:33:25 +00:00
Jean-Philippe Lang
fd4a911304 Fixed that project copy triggers a 500 error if project validation fails. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13848 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:29:50 +00:00
Jean-Philippe Lang
5d2eea1489 Cleans up parent project assignment in ProjectsController. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13847 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:19:57 +00:00