76c9a6682f
Remove duplicated test
2011-06-03 09:15:46 -07:00
aa07982daa
Fix an edge-edge case bug in journal_attributes_for_user with different users
...
In one case in a plugin (not able to reproduce in core) journal_attributes_for_user
would set the :user to something different than what's in updated_by thus assigning
the Journal to the wrong user.
2011-06-01 22:00:02 -07:00
db3480bdb6
[ #436 ] Fix test relying on trailing whitespace.
2011-05-31 09:59:19 +02:00
a428fa6068
Bumping version to 2.0.0RC1
2011-05-30 14:22:31 -07:00
821d9f5ca4
[ #437 ] Move the encoding to the top of pdf.rb for Ruby 1.9
2011-05-30 14:20:20 -07:00
790bb362c5
Fix the merge conflict from 6b8897db5f
2011-05-30 14:05:40 -07:00
6b8897db5f
Merge branch 'unstable' into release-v2.0.0
2011-05-30 21:25:11 +02:00
12e29be604
Merge branch 'issues/unstable/436-trailing-whitespace' into unstable
2011-05-30 21:18:48 +02:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
b72785b274
[ #436 ] Adapt rake task to also clean trailing whitespace
2011-05-30 20:49:58 +02:00
40ce66d05d
[ #197 ] Better regex and no trailing whitespace.
2011-05-30 19:58:54 +02:00
37f6b75749
Added VERSION.special to handle special version releases (RC, distributions, etc)
2011-05-29 17:59:51 -07:00
e68a869d2d
Update RUNNING_TESTS.rdoc to point to a wiki page
2011-05-29 17:42:49 -07:00
cfe2483e13
Update CHANGELOG for 2.0.0
2011-05-29 17:40:45 -07:00
ec3717e644
Merge branch 'ticket/unstable/197-copyright' into unstable
2011-05-29 13:44:34 -07:00
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
f18090891f
[ #197 ] Add a rake task to update the copyright in code files
2011-05-29 13:11:37 -07:00
e131c3b531
[ #197 ] Remove old copyrights
2011-05-29 12:50:08 -07:00
36f34887f3
[ #197 ] Fix up main copyright files
2011-05-29 12:10:31 -07:00
96298eac64
Merge branch 'ticket/unstable/262-line-endings' into unstable
2011-05-29 12:00:33 -07:00
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07:00
05a4c4616f
[ #262 ] Add a rake task to convert line endings to UNIX
2011-05-29 11:59:57 -07:00
bc249871a6
[ #407 ] Remove deferred Journal#visible tests
2011-05-29 11:11:26 -07:00
8b06e26059
[ #350 ] Force clearing the cache before each test
2011-05-27 15:52:24 -07:00
5a9ffe9627
Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable
2011-05-27 15:00:08 -07:00
e4fac8d40f
[ #350 ] Refactor: extract method
2011-05-27 14:59:42 -07:00
9e1b6c14c8
[ #345 ] Remove BigDecimal patch since Rails 2.3.11 includes a mitigation
2011-05-27 14:37:10 -07:00
9baa310486
Fixed test by replacing assert_tag with assert_select
2011-05-27 14:16:38 -07:00
b95c526151
Fix failing test: RepositoryMercurialTest#test_activities
2011-05-27 14:08:18 -07:00
cd64d11e17
Merge branch 'master' into unstable
...
Conflicts:
app/controllers/watchers_controller.rb
app/views/issues/_action_menu.rhtml
config/locales/pt-BR.yml
doc/CHANGELOG.rdoc
lib/redmine/export/pdf.rb
lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
44b1bcfa37
Merge branch 'release-v1.4.0'
2011-05-27 11:41:22 -07:00
0e31482de9
Bump version to 1.4.0
2011-05-27 11:37:03 -07:00
f6454629f2
Update Changelog for release 1.4.0
2011-05-27 11:22:49 -07:00
46f66add1f
Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable
2011-05-27 10:42:53 -07:00
ce8bb652c6
[ #423 ] Removed explicit render in WikiController#show
...
* Allows for format extensions in plugins w/o giving a double-render
error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
(vs. just 'sidebar')
2011-05-27 10:20:45 -07:00
762cc04b70
Port 784bbccf's custom value test back into aaj
2011-05-27 10:16:47 -07:00
f883758c95
Fix test: Search results are showing this as an issue-edit event
2011-05-27 10:15:49 -07:00
e9676954be
Fix tpyo in the example
2011-05-27 09:28:45 -07:00
b8904ce7a2
Handle a nil user when testin email.
...
undefined method `logged?' for nil:NilClass
2011-05-27 09:27:05 -07:00
5cbf188032
Merge remote-tracking branch 'schmidt/b/425-avoid-deprec-notation-for-rake-tasks/master'
2011-05-27 09:26:07 -07:00
c4658bd271
[ #202 ] Add the theme used on chiliproject.org
...
Using 3c2ef2757165e23b65fd from
https://github.com/edavis10/squeejee_theme/tree/chiliproject.org
2011-05-27 09:18:48 -07:00
7796ae89ff
Fix the issue #424 .
2011-05-26 21:09:21 -03:00
c51a32ac23
Use Rails.cache to cache application settings. #350
2011-05-25 17:11:16 +02:00
5c8e04db55
Fix SearchController tests.
...
The "dd" the removed assert_tag part was supposed to find should never show up on the page in the first place (it's in a journal, not in the issue itself).
2011-05-25 16:40:34 +02:00
20a5e41538
[ #425 ] Avoid deprecated API to define rake tasks with parameters
...
This should avoid deprecation warnings when using ChiliProject with Rake 0.9
2011-05-24 17:02:30 +02:00
35a38086e3
[ #112 ] Fix tests for jruby
2011-05-22 19:46:31 +02:00
18247a6c58
[112] Detect SQLite3 version on JRuby
2011-05-22 19:02:53 +02:00
79ed4920cf
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-21 02:03:10 +02:00
6f809b826e
Replace a call to changes with its code from AR::Dirty. #422
...
acts_as_journalized called changes as per ActiveRecord::Dirty
(see http://ar.rubyonrails.org/classes/ActiveRecord/Dirty.html#M000291 ),
the journalized model Changeset :has_many changes though, which
made the call return a list of associated objects instead of the
intended list of changed attributes. Replaced changes with the code
from AR::Dirty to work around that.
2011-05-21 02:02:52 +02:00
1d5d73afe3
Fix RepositoriesFilesystemControllerTest for jRuby
...
Iconv on jRuby does not accept an empty string as "from" encoding.
Use the default behavior from the controller instead to leave it
unspecified and thuse use UTF-8.
2011-05-21 01:17:17 +02:00
Eric Davis
Holger Just
Tom Kersten
Emilio Carlos da Palma
Felix Schäfer
Gregor Schmidt