Merged r2697, r2720, r2723, r2724, r2727, r2745 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2746 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
a3f69e248a
commit
3f6656a495
|
@ -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
|
||||
|
|
|
@ -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)),
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}" }
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue