diff options
| -rw-r--r-- | app/controllers/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/repositories_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/repository/subversion.rb | 2 | ||||
| -rw-r--r-- | app/models/wiki_content.rb | 1 | ||||
| -rw-r--r-- | app/views/common/feed.atom.rxml | 4 | ||||
| -rw-r--r-- | app/views/issues/show.rhtml | 2 | ||||
| -rw-r--r-- | doc/CHANGELOG | 6 |
7 files changed, 13 insertions, 6 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index f74851abb..62102a3f6 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -23,7 +23,7 @@ class IssuesController < ApplicationController before_filter :find_project, :only => [:new, :update_form, :preview] before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu] before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar] - accept_key_auth :index, :changes + accept_key_auth :index, :show, :changes helper :journals helper :projects diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index d41977d29..f8f501a67 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -147,7 +147,7 @@ module RepositoriesHelper def subversion_field_tags(form, repository) content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) + - '<br />(http://, https://, svn://, file:///)') + + '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') + content_tag('p', form.text_field(:login, :size => 30)) + content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore', :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)), diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb index d97528ee7..17745a876 100644 --- a/app/models/repository/subversion.rb +++ b/app/models/repository/subversion.rb @@ -20,7 +20,7 @@ require 'redmine/scm/adapters/subversion_adapter' class Repository::Subversion < Repository attr_protected :root_url validates_presence_of :url - validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i + validates_format_of :url, :with => /^(http|https|svn(\+[^\s:\/\\]+)?|file):\/\/.+/i def scm_adapter Redmine::Scm::Adapters::SubversionAdapter diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index e958e7b24..d206be97d 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -22,6 +22,7 @@ class WikiContent < ActiveRecord::Base belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id' belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' validates_presence_of :text + validates_length_of :comments, :maximum => 255, :allow_nil => true acts_as_versioned class Version diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml index 8d07cf208..629ea4afa 100644 --- a/app/views/common/feed.atom.rxml +++ b/app/views/common/feed.atom.rxml @@ -1,8 +1,8 @@ xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do xml.title truncate_single_line(@title, 100) - xml.link "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false})) - xml.link "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false) + xml.link "rel" => "self", "href" => url_for(params.merge(:only_path => false)) + xml.link "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil)) xml.id url_for(:controller => 'welcome', :only_path => false) xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema) xml.author { xml.name "#{Setting.app_title}" } diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index b685c4f27..806271c66 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -45,7 +45,7 @@ </tr> <tr> <% n = 0 -%> -<% @issue.custom_values.each do |value| -%> +<% @issue.custom_field_values.each do |value| -%> <td valign="top"><b><%=h value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(value))) %></td> <% n = n + 1 if (n > 1) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 4ebc41c46..6528e756b 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -12,6 +12,12 @@ http://www.redmine.org/ * Fixed: Mercurial integration doesn't work if Redmine is installed in folder path containing space * Fixed: an error is raised when no tab is available on project settings * Fixed: insert image macro corrupts urls with excalamation marks +* Fixed: error on cross-project gantt PNG export +* Fixed: self and alternate links in atom feeds do not respect Atom specs +* Fixed: accept any svn tunnel scheme in repository URL +* Fixed: issues/show should accept user's rss key +* Fixed: consistency of custom fields display on the issue detail view +* Fixed: wiki comments length validation is missing == 2009-04-05 v0.8.3 |