Commit Graph

4630 Commits

Author SHA1 Message Date
Eric Davis e9c542d7da Merge remote-tracking branch 'asoltys/feature/link_to_user_profile_from_account_page' into unstable 2011-05-11 15:29:49 -07:00
Adam Soltys f27614b576 make username a link to their profile page 2011-05-11 16:18:04 -06:00
Gregor Schmidt c2d058a53b [#390] check to handle mysql2's early type casting 2011-05-11 00:19:11 +02:00
Gregor Schmidt ddcd4f2888 Pinning mysql2 gem to 0.2 branch, since 0.3 and the following are Rails 3 only 2011-05-10 08:42:37 +02:00
Gregor Schmidt a0eb66fc98 [#290] using ~> instead of < for i18n dependency
it is more accurate in this case
2011-05-10 08:40:58 +02:00
Gregor Schmidt cbc26ea982 [#290] Remove test gems from dev enviroment.
running single test without RAILS_ENV=test prefix seams to work without it.
2011-05-10 08:40:58 +02:00
Gregor Schmidt 326dffbc29 [#290] Adding rmagick, making it opt-out
using version < 2.0 since later versions do not work w/o backports on Debian Lenny
2011-05-10 08:40:58 +02:00
Gregor Schmidt ddcec2f4a0 [#290] making openid opt-out by adding it to a group 2011-05-10 08:40:58 +02:00
Gregor Schmidt 8304c6847a [#290] loading mocha after shoulda to make sure, that mocha's patches can be properly applied 2011-05-10 08:40:58 +02:00
Gregor Schmidt 2ec21614fd [#290] Removing all vendored gems 2011-05-10 08:40:58 +02:00
Gregor Schmidt ec569be507 [#290] ignoring .rvmrc files 2011-05-10 08:40:58 +02:00
Gregor Schmidt 87d8634b04 [#290] using bundler
* following setup instructions from http://gembundler.com/rails23.html
* adding generated files to .gitignore and .hgignore
* removing config.gem calls
* adding Gemfile that should work with all supported dbs and interpreters
* removing work-around for rubygems 1.5 deprecation. this seems to be fixed since now bundler handles the gem loading
2011-05-10 08:40:42 +02:00
Eric Davis 13de4cc4b0 [#383] Fixed failing tests due to a helper method name conflict (to_utf8)
Introduced in 1eee7312f6
2011-05-06 16:38:13 -07:00
Eric Davis d29315341d [#196 #216 #216] Complete the upgrade to Rails 2.3.11 2011-05-06 15:44:38 -07:00
Eric Davis cd73bd714f [#123] Fix test error due to un-reloaded object daddy objects 2011-05-06 14:48:11 -07:00
Eric Davis cc0c2165b5 [#123] Fix test on postgres, .first isn't based on ORDER 2011-05-06 14:48:11 -07:00
Eric Davis 65953cdc04 [#123] Fix AttachmentsController test from 1f88288 2011-05-06 14:48:11 -07:00
Eric Davis 1f8828838e [#123] Attachment changes need to be prefixed 2011-05-06 14:08:39 -07:00
Simon COURTOIS bfacd827a8 Removig english strings from RepositoriesHelper 2011-05-05 22:05:41 +02:00
Eric Davis bdc7325a82 Merge branch 'master' into unstable
Conflicts:
	doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
Eric Davis 9d13deee46 Merge branch 'release-v1.3.0' 2011-05-01 13:56:36 -07:00
Eric Davis 07772e7eb7 Bump version to 1.3.0 2011-05-01 13:09:15 -07:00
Eric Davis db89e91927 Update Changelog for 1.3.0 release 2011-05-01 12:47:16 -07:00
Eric Davis afe5a2b2e8 Merge branch 'ticket/master/347-execution-after-redirect' 2011-05-01 12:31:43 -07:00
Eric Davis 614bad89a5 Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable
Conflicts:
	config/locales/en.yml
	test/unit/journal_test.rb
2011-04-29 08:46:13 -07:00
Eric Davis d2973a641e [#347] Fix potential Execution After Redirect bugs
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.

Contributed by Adam Doupé
2011-04-28 14:39:19 -07:00
Eric Davis 72cd7f2049 [#347] Add missing fixture when running a focused test 2011-04-28 14:22:29 -07:00
Eric Davis 65692235a4 [#352] Use ChiliProject on error pages 2011-04-26 15:19:44 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Eric Davis d02d8e7e17 Merge remote-tracking branch 'schmidt/b/346-fix-invalid-yaml' into unstable 2011-04-21 13:08:52 -07:00
Gregor Schmidt 90987ca34e [#346] Fixing polish and swedish translations to work with psych 2011-04-21 13:24:49 +02:00
Gregor Schmidt 31d292ce95 [#346] Fixing hebrew translations to work with psyc 2011-04-21 13:21:13 +02:00
Gregor Schmidt 50faef3712 [#346] also fixing errornous string starting with % 2011-04-21 12:04:04 +02:00
Gregor Schmidt 3b7ea67a99 [#346] changing i18n files to use valid yaml syntax that may be parsed by psych 2011-04-21 11:47:32 +02:00
Felix Schäfer 61f0e67c0d Upgrade tests to new journals type. 2011-04-21 11:46:00 +02:00
Felix Schäfer ef8141a2c1 Remove deprecated journals tests and controller. 2011-04-21 11:45:31 +02:00
Felix Schäfer d4adcae569 Update the Issue#show.api to new journals type 2011-04-21 11:44:55 +02:00
Felix Schäfer 9ca203beae Update to latest version of acts_as_journalized. 2011-04-21 11:44:16 +02:00
Eric Davis ed252f7246 [#309] Set the back_url after sending a lost password so HTTP_REFERER isn't used
Contributed by Robert Chady
2011-04-20 16:24:54 -07:00
Eric Davis 1eee7312f6 [#289] Remove single helpers in favor of :all in ApplicationController 2011-04-20 16:08:00 -07:00
Felix Schäfer 43ee27715a JournalDetails don't exist anymore. 2011-04-21 00:01:26 +02:00
Felix Schäfer ff431e8ed4 Force changeset journal creation. 2011-04-20 23:49:21 +02:00
Eric Davis d14417070d Merge branch 'ticket/unstable/288-april-upstream-redmine-review' into unstable 2011-04-16 16:38:00 -07:00
Eric Davis f06f846fce Locales update post-merge 2011-04-16 16:19:31 -07:00
Jean-Philippe Lang 42653cef32 Shorten query[column_names] param name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
Jean-Philippe Lang e78149f85c Keep issue filter params on sort headers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
Jean-Philippe Lang 1335548949 Changes pagination links to non-AJAX requests (#5138).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5302 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:53 -07:00
Jean-Philippe Lang 07cf681d61 Makes all pagination-like links use #link_to_content_update (#5138).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:50 -07:00
Jean-Philippe Lang 844c0d97aa Removed the changeset-changes class to the commit logs on the issue view (#8038).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5300 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 0c0763ad4b Disable unused fields when switching the period type.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5299 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00