tagged version 2.3.1

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/2.3.1@11759 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
-gem "coderay", "~> 1.0.9"
+gem "coderay", "~> 1.0.6"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 
@@ -80,7 +80,6 @@ group :test do
   gem "shoulda", "~> 3.3.2"
   gem "mocha", "~> 0.13.3"
   gem 'capybara', '~> 2.0.0'
-  gem 'nokogiri', '< 1.6.0'
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")

app/controllers/enumerations_controller.rb

@@ -70,12 +70,14 @@ class EnumerationsController < ApplicationController
       @enumeration.destroy
       redirect_to enumerations_path
       return
-    elsif params[:reassign_to_id].present? && (reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id].to_i))
+    elsif params[:reassign_to_id]
-      @enumeration.destroy(reassign_to)
+      if reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id])
-      redirect_to enumerations_path
+        @enumeration.destroy(reassign_to)
-      return
+        redirect_to enumerations_path
+        return
+      end
     end
-    @enumerations = @enumeration.class.system.all - [@enumeration]
+    @enumerations = @enumeration.class.all - [@enumeration]
   end
 
   private

app/controllers/my_controller.rb

@@ -53,6 +53,7 @@ class MyController < ApplicationController
     if request.post?
       @user.safe_attributes = params[:user]
       @user.pref.attributes = params[:pref]
+      @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
       if @user.save
         @user.pref.save
         @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])

app/controllers/users_controller.rb

@@ -92,6 +92,7 @@ class UsersController < ApplicationController
 
     if @user.save
       @user.pref.attributes = params[:pref]
+      @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
       @user.pref.save
       @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
 
@@ -136,6 +137,7 @@ class UsersController < ApplicationController
     was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
     # TODO: Similar to My#account
     @user.pref.attributes = params[:pref]
+    @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
 
     if @user.save
       @user.pref.save

app/models/enumeration.rb

@@ -38,7 +38,6 @@ class Enumeration < ActiveRecord::Base
   scope :shared, lambda { where(:project_id => nil) }
   scope :sorted, lambda { order("#{table_name}.position ASC") }
   scope :active, lambda { where(:active => true) }
-  scope :system, lambda { where(:project_id => nil) }
   scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
 
   def self.default

app/models/issue.rb

@@ -854,99 +854,18 @@ class Issue < ActiveRecord::Base
   end
 
   # Returns all the other issues that depend on the issue
-  # The algorithm is a modified breadth first search (bfs)
   def all_dependent_issues(except=[])
-    # The found dependencies
+    except << self
     dependencies = []
-
+    dependencies += relations_from.map(&:issue_to)
-    # The visited flag for every node (issue) used by the breadth first search
+    dependencies += children unless leaf?
-    eNOT_DISCOVERED         = 0       # The issue is "new" to the algorithm, it has not seen it before.
+    dependencies.compact!
-
-    ePROCESS_ALL            = 1       # The issue is added to the queue. Process both children and relations of
-                                      # the issue when it is processed.
-
-    ePROCESS_RELATIONS_ONLY = 2       # The issue was added to the queue and will be output as dependent issue,
-                                      # but its children will not be added to the queue when it is processed.
-
-    eRELATIONS_PROCESSED    = 3       # The related issues, the parent issue and the issue itself have been added to
-                                      # the queue, but its children have not been added.
-
-    ePROCESS_CHILDREN_ONLY  = 4       # The relations and the parent of the issue have been added to the queue, but
-                                      # the children still need to be processed.
-
-    eALL_PROCESSED          = 5       # The issue and all its children, its parent and its related issues have been
-                                      # added as dependent issues. It needs no further processing.
-
-    issue_status = Hash.new(eNOT_DISCOVERED)
-
-    # The queue
-    queue = []
-
-    # Initialize the bfs, add start node (self) to the queue
-    queue << self
-    issue_status[self] = ePROCESS_ALL
-
-    while (!queue.empty?) do
-      current_issue = queue.shift
-      current_issue_status = issue_status[current_issue]
-      dependencies << current_issue
-
-      # Add parent to queue, if not already in it.
-      parent = current_issue.parent
-      parent_status = issue_status[parent]
-
-      if parent && (parent_status == eNOT_DISCOVERED) && !except.include?(parent)
-        queue << parent
-        issue_status[parent] = ePROCESS_RELATIONS_ONLY
-      end
-
-      # Add children to queue, but only if they are not already in it and
-      # the children of the current node need to be processed.
-      if (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL)
-        current_issue.children.each do |child|
-          next if except.include?(child)
-
-          if (issue_status[child] == eNOT_DISCOVERED)
-            queue << child
-            issue_status[child] = ePROCESS_ALL
-          elsif (issue_status[child] == eRELATIONS_PROCESSED)
-            queue << child
-            issue_status[child] = ePROCESS_CHILDREN_ONLY
-          elsif (issue_status[child] == ePROCESS_RELATIONS_ONLY)
-            queue << child
-            issue_status[child] = ePROCESS_ALL
-          end
-        end
-      end
-
-      # Add related issues to the queue, if they are not already in it.
-      current_issue.relations_from.map(&:issue_to).each do |related_issue|
-        next if except.include?(related_issue)
-
-        if (issue_status[related_issue] == eNOT_DISCOVERED)
-          queue << related_issue
-          issue_status[related_issue] = ePROCESS_ALL
-        elsif (issue_status[related_issue] == eRELATIONS_PROCESSED)
-          queue << related_issue
-          issue_status[related_issue] = ePROCESS_CHILDREN_ONLY
-        elsif (issue_status[related_issue] == ePROCESS_RELATIONS_ONLY)
-          queue << related_issue
-          issue_status[related_issue] = ePROCESS_ALL
-        end
-      end
-
-      # Set new status for current issue
-      if (current_issue_status == ePROCESS_ALL) || (current_issue_status == ePROCESS_CHILDREN_ONLY)
-        issue_status[current_issue] = eALL_PROCESSED
-      elsif (current_issue_status == ePROCESS_RELATIONS_ONLY)
-        issue_status[current_issue] = eRELATIONS_PROCESSED
-      end
-    end # while
-
-    # Remove the issues from the "except" parameter from the result array
     dependencies -= except
-    dependencies.delete(self)
+    dependencies += dependencies.map {|issue| issue.all_dependent_issues(except)}.flatten
-
+    if parent
+      dependencies << parent
+      dependencies += parent.all_dependent_issues(except + parent.descendants)
+    end
     dependencies
   end
 

app/models/mailer.rb

@@ -390,7 +390,7 @@ class Mailer < ActionMailer::Base
 
     # Removes the author from the recipients and cc
     # if he doesn't want to receive notifications about what he does
-    if @author && @author.logged? && @author.pref.no_self_notified
+    if @author && @author.logged? && @author.pref[:no_self_notified]
       headers[:to].delete(@author.mail) if headers[:to].is_a?(Array)
       headers[:cc].delete(@author.mail) if headers[:cc].is_a?(Array)
     end

app/models/project.rb

@@ -673,7 +673,7 @@ class Project < ActiveRecord::Base
 
   # Returns an auto-generated project identifier based on the last identifier used
   def self.next_identifier
-    p = Project.order('id DESC').first
+    p = Project.order('created_on DESC').first
     p.nil? ? nil : p.identifier.to_s.succ
   end
 
@@ -840,9 +840,6 @@ class Project < ActiveRecord::Base
       new_issue = Issue.new
       new_issue.copy_from(issue, :subtasks => false, :link => false)
       new_issue.project = self
-      # Changing project resets the custom field values
-      # TODO: handle this in Issue#project=
-      new_issue.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
       # Reassign fixed_versions by name, since names are unique per project
       if issue.fixed_version && issue.fixed_version.project == project
         new_issue.fixed_version = self.versions.detect {|v| v.name == issue.fixed_version.name}

app/models/query.rb

@@ -577,11 +577,8 @@ class Query < ActiveRecord::Base
       customized_class = queried_class.reflect_on_association(assoc.to_sym).klass.base_class rescue nil
       raise "Unknown #{queried_class.name} association #{assoc}" unless customized_class
     end
-    where = sql_for_field(field, operator, value, db_table, db_field, true)
+    "#{queried_table_name}.#{customized_key} #{not_in} IN (SELECT #{customized_class.table_name}.id FROM #{customized_class.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='#{customized_class}' AND #{db_table}.customized_id=#{customized_class.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id} WHERE " +
-    if operator =~ /[<>]/
+      sql_for_field(field, operator, value, db_table, db_field, true) + ')'
-      where = "(#{where}) AND #{db_table}.#{db_field} <> ''"
-    end
-    "#{queried_table_name}.#{customized_key} #{not_in} IN (SELECT #{customized_class.table_name}.id FROM #{customized_class.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='#{customized_class}' AND #{db_table}.customized_id=#{customized_class.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id} WHERE #{where})"
   end
 
   # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+

app/models/time_entry_activity.rb

@@ -24,15 +24,11 @@ class TimeEntryActivity < Enumeration
     OptionName
   end
 
-  def objects
-    TimeEntry.where(:activity_id => self_and_descendants(1).map(&:id))
-  end
-
   def objects_count
-    objects.count
+    time_entries.count
   end
 
   def transfer_relations(to)
-    objects.update_all(:activity_id => to.id)
+    time_entries.update_all("activity_id = #{to.id}")
   end
 end

app/models/user_preference.rb

@@ -56,7 +56,4 @@ class UserPreference < ActiveRecord::Base
 
   def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end
   def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end
-
-  def no_self_notified; (self[:no_self_notified] == true || self[:no_self_notified] == '1'); end
-  def no_self_notified=(value); self[:no_self_notified]=value; end
 end

app/models/version.rb

@@ -47,8 +47,7 @@ class Version < ActiveRecord::Base
     'wiki_page_title',
     'status',
     'sharing',
-    'custom_field_values',
+    'custom_field_values'
-    'custom_fields'
 
   # Returns true if +user+ or current user is allowed to view the version
   def visible?(user=User.current)

app/views/documents/show.html.erb

@@ -12,7 +12,7 @@
 <p><em><%=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
 <div class="wiki">
-<%= textilizable @document, :description, :attachments => @document.attachments %>
+<%= textilizable @document.description, :attachments => @document.attachments %>
 </div>
 
 <h3><%= l(:label_attachment_plural) %></h3>

app/views/enumerations/destroy.html.erb

@@ -4,7 +4,7 @@
 <div class="box">
 <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
 <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
-<%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '') + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
+<%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
 </div>
 
 <%= submit_tag l(:button_apply) %>

app/views/mailer/issue_edit.html.erb

@@ -1,6 +1,3 @@
-<% if @journal.private_notes? %>
-  (<%= l(:field_private_notes) %>)
-<% end %>
 <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
 
 <ul>

app/views/mailer/issue_edit.text.erb

@@ -1,4 +1,4 @@
-<%= "(#{l(:field_private_notes)}) " if @journal.private_notes? -%><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
 
 <% details_to_strings(@journal.details, true).each do |string| -%>
 <%= string %>

app/views/queries/_filters.html.erb

@@ -3,7 +3,7 @@ var operatorLabels = <%= raw_json Query.operators_labels %>;
 var operatorByType = <%= raw_json Query.operators_by_filter_type %>;
 var availableFilters = <%= raw_json query.available_filters_as_json %>;
 var labelDayPlural = <%= raw_json l(:label_day_plural) %>;
-var allProjects = <%= raw_json query.all_projects_values %>;
+var allProjects = <%= raw query.all_projects_values.to_json %>;
 $(document).ready(function(){
   initFilters();
   <% query.filters.each do |field, options| %>

app/views/users/_mail_notifications.html.erb

@@ -19,10 +19,9 @@
       end %>
   <p><em class="info"><%= l(:text_user_mail_option) %></em></p>
 <% end %>
-
-<%= fields_for :pref, @user.pref do |pref_fields| %>
 <p>
-  <%= pref_fields.check_box :no_self_notified %>
+  <label>
-  <label for="pref_no_self_notified"><%= l(:label_user_mail_no_self_notified) %></label>
+    <%= l(:label_user_mail_no_self_notified) %>
+    <%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %>
+  </label>
 </p>
-<% end %>

config/locales/ar.yml

@@ -50,8 +50,8 @@ ar:
         one:   "حوالي ساعة"
         other: "ساعات %{count}حوالي "
       x_hours:
-        one:   "%{count} ساعة"
+        one:   "1 hour"
-        other: "%{count} ساعات"
+        other: "%{count} hours"
       x_days:
         one:   "يوم"
         other: "%{count} أيام"

config/locales/az.yml

@@ -109,8 +109,8 @@ az:
         many:  "təxminən %{count} saat"
         other: "təxminən %{count} saat"
       x_hours:
-        one:   "1 saat"
+        one:   "1 hour"
-        other: "%{count} saat"
+        other: "%{count} hours"
       x_days:
         one:   "%{count} gün"
         few:   "%{count} gün"

config/locales/bg.yml

@@ -51,8 +51,8 @@ bg:
         one:   "около 1 час"
         other: "около %{count} часа"
       x_hours:
-        one:   "1 час"
+        one:   "1 hour"
-        other: "%{count} часа"
+        other: "%{count} hours"
       x_days:
         one:   "1 ден"
         other: "%{count} дена"

config/locales/bs.yml

@@ -49,8 +49,8 @@ bs:
         one:   "oko 1 sahat"
         other: "oko %{count} sahata"
       x_hours:
-        one:   "1 sahat"
+        one:   "1 hour"
-        other: "%{count} sahata"
+        other: "%{count} hours"
       x_days:
         one:   "1 dan"
         other: "%{count} dana"

config/locales/ca.yml

@@ -53,8 +53,8 @@ ca:
         one:   "aproximadament 1 hora"
         other: "aproximadament %{count} hores"
       x_hours:
-        one:   "1 hora"
+        one:   "1 hour"
-        other: "%{count} hores"
+        other: "%{count} hours"
       x_days:
         one:   "1 dia"
         other: "%{count} dies"

config/locales/cs.yml

@@ -55,8 +55,8 @@ cs:
         one:   "asi 1 hodina"
         other: "asi %{count} hodin"
       x_hours:
-        one:   "1 hodina"
+        one:   "1 hour"
-        other: "%{count} hodin"
+        other: "%{count} hours"
       x_days:
         one:   "1 den"
         other: "%{count} dnů"

config/locales/da.yml

@@ -52,8 +52,8 @@ da:
         one:  "cirka en time"
         other: "cirka %{count} timer"
       x_hours:
-        one:   "1 time"
+        one:   "1 hour"
-        other: "%{count} timer"
+        other: "%{count} hours"
       x_days:
         one:  "en dag"
         other: "%{count} dage"

config/locales/de.yml

@@ -53,8 +53,8 @@ de:
         one: 'etwa 1 Stunde'
         other: 'etwa %{count} Stunden'
       x_hours:
-        one:   "1 Stunde"
+        one:   "1 hour"
-        other: "%{count} Stunden"
+        other: "%{count} hours"
       x_days:
         one: '1 Tag'
         other: '%{count} Tagen'

config/locales/el.yml

@@ -52,8 +52,8 @@ el:
         one:   "περίπου 1 ώρα"
         other: "περίπου %{count} ώρες"
       x_hours:
-        one:   "1 ώρα"
+        one:   "1 hour"
-        other: "%{count} ώρες"
+        other: "%{count} hours"
       x_days:
         one:   "1 ημέρα"
         other: "%{count} ημέρες"

config/locales/es.yml

@@ -80,8 +80,8 @@ es:
         one:  "alrededor de 1 hora"
         other: "alrededor de %{count} horas"
       x_hours:
-        one:   "1 hora"
+        one:   "1 hour"
-        other: "%{count} horas"
+        other: "%{count} hours"
       x_days:
         one:  "1 día"
         other: "%{count} días"

config/locales/et.yml

@@ -67,8 +67,8 @@ et:
         one:   "umbes tund"
         other: "umbes %{count} tundi"
       x_hours:
-        one:   "1 tund"
+        one:   "1 hour"
-        other: "%{count} tundi"
+        other: "%{count} hours"
       x_days:
         one:   "1 päev"
         other: "%{count} päeva"

config/locales/eu.yml

@@ -53,8 +53,8 @@ eu:
         one:   "ordu 1 inguru"
         other: "%{count} ordu inguru"
       x_hours:
-        one:   "ordu 1"
+        one:   "1 hour"
-        other: "%{count} ordu"
+        other: "%{count} hours"
       x_days:
         one:   "egun 1"
         other: "%{count} egun"

config/locales/fa.yml

@@ -50,8 +50,8 @@ fa:
         one:   "نزدیک 1 ساعت"
         other: "نزدیک %{count} ساعت"
       x_hours:
-        one:   "1 ساعت"
+        one:   "1 hour"
-        other: "%{count} ساعت"
+        other: "%{count} hours"
       x_days:
         one:   "1 روز"
         other: "%{count} روز"

config/locales/fi.yml

@@ -95,8 +95,8 @@ fi:
         one:   "noin tunti"
         other: "noin %{count} tuntia"
       x_hours:
-        one:   "1 tunti"
+        one:   "1 hour"
-        other: "%{count} tuntia"
+        other: "%{count} hours"
       x_days:
         one:   "päivä"
         other: "%{count} päivää"

config/locales/gl.yml

@@ -91,8 +91,8 @@ gl:
         one: 'aproximadamente unha hora'
         other: '%{count} horas'
       x_hours:
-        one:   "1 hora"
+        one:   "1 hour"
-        other: "%{count} horas"
+        other: "%{count} hours"
       x_days:
         one: '1 día'
         other: '%{count} días'

config/locales/he.yml

@@ -56,8 +56,8 @@ he:
         one: 'בערך שעה אחת'
         other: 'בערך %{count} שעות'
       x_hours:
-        one:   "1 שעה"
+        one:   "1 hour"
-        other: "%{count} שעות"
+        other: "%{count} hours"
       x_days:
         one: 'יום אחד'
         other: '%{count} ימים'

config/locales/hr.yml

@@ -49,8 +49,8 @@ hr:
         one:   "oko sat vremena"
         other: "oko %{count} sati"
       x_hours:
-        one:   "1 sata"
+        one:   "1 hour"
-        other: "%{count} sati"
+        other: "%{count} hours"
       x_days:
         one:   "1 dan"
         other: "%{count} dana"

config/locales/hu.yml

@@ -51,8 +51,8 @@
         one: 'csaknem 1 órája'
         other: 'csaknem %{count} órája'
       x_hours:
-        one:   "1 óra"
+        one:   "1 hour"
-        other: "%{count} óra"
+        other: "%{count} hours"
       x_days:
         one: '1 napja'
         other: '%{count} napja'

config/locales/id.yml

@@ -47,8 +47,8 @@ id:
         one:   "sekitar sejam"
         other: "sekitar %{count} jam"
       x_hours:
-        one:   "1 jam"
+        one:   "1 hour"
-        other: "%{count} jam"
+        other: "%{count} hours"
       x_days:
         one:   "sehari"
         other: "%{count} hari"

config/locales/it.yml

@@ -55,8 +55,8 @@ it:
         one:  "circa un'ora"
         other: "circa %{count} ore"
       x_hours:
-        one:   "1 ora"
+        one:   "1 hour"
-        other: "%{count} ore"
+        other: "%{count} hours"
       x_days:
         one:  "1 giorno"
         other: "%{count} giorni"
@@ -1001,87 +1001,90 @@ it:
   button_export: Esporta
   label_export_options: "%{export_format} opzioni per l'export"
   error_attachment_too_big: Questo file non può essere caricato in quanto la sua dimensione supera la massima consentita (%{max_size})
-  notice_failed_to_save_time_entries: "Non ho potuto salvare %{count} registrazioni di tempo impiegato su %{total} selezionate: %{ids}."
+  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
   label_x_issues:
     zero:  0 segnalazione
     one:   1 segnalazione
     other: "%{count} segnalazioni"
-  label_repository_new: Nuovo repository
+  label_repository_new: New repository
-  field_repository_is_default: Repository principale
+  field_repository_is_default: Main repository
-  label_copy_attachments: Copia allegati
+  label_copy_attachments: Copy attachments
   label_item_position: "%{position}/%{count}"
   label_completed_versions: Completed versions
-  text_project_identifier_info: Consentiti solo lettere minuscole (a-z), numeri, trattini e trattini bassi.<br />Una volta salvato, l'identificatore non può essere modificato.
+  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
-  field_multiple: Valori multipli
+  field_multiple: Multiple values
   setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
-  text_issue_conflict_resolution_add_notes: Aggiunge le mie note e non salvare le mie ulteriori modifiche
+  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
-  text_issue_conflict_resolution_overwrite: Applica comunque le mie modifiche (le note precedenti verranno mantenute ma alcuni cambiamenti potrebbero essere sovrascritti)
+  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: La segnalazione è stata aggiornata da un altro utente mentre la stavi editando.
+  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
-  text_issue_conflict_resolution_cancel: Cancella ogni modifica e rivisualizza %{link}
+  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
-  permission_manage_related_issues: Gestisci relative segnalazioni
+  permission_manage_related_issues: Manage related issues
-  field_auth_source_ldap_filter: Filtro LDAP
+  field_auth_source_ldap_filter: LDAP filter
-  label_search_for_watchers: Cerca osservatori da aggiungere
+  label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Il tuo account sarà definitivamente rimosso.
+  notice_account_deleted: Your account has been permanently deleted.
-  setting_unsubscribe: Consentire agli utenti di cancellare il proprio account
+  setting_unsubscribe: Allow users to delete their own account
-  button_delete_my_account: Cancella il mio account
+  button_delete_my_account: Delete my account
-  text_account_destroy_confirmation: "Sei sicuro di voler procedere?\nIl tuo account sarà definitivamente cancellato, senza alcuna possibilità di ripristino."
+  text_account_destroy_confirmation: |-
-  error_session_expired: "La tua sessione è scaduta. Effettua nuovamente il login."
+    Are you sure you want to proceed?
-  text_session_expiration_settings: "Attenzione: la modifica di queste impostazioni può far scadere le sessioni correnti, compresa la tua."
+    Your account will be permanently deleted, with no way to reactivate it.
-  setting_session_lifetime: Massima durata di una sessione
+  error_session_expired: Your session has expired. Please login again.
-  setting_session_timeout: Timeout di inattività di una sessione
+  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  label_session_expiration: Scadenza sessione
+  setting_session_lifetime: Session maximum lifetime
-  permission_close_project: Chiusura / riapertura progetto
+  setting_session_timeout: Session inactivity timeout
-  label_show_closed_projects: Vedi progetti chiusi
+  label_session_expiration: Session expiration
-  button_close: Chiudi
+  permission_close_project: Close / reopen the project
-  button_reopen: Riapri
+  label_show_closed_projects: View closed projects
-  project_status_active: attivo
+  button_close: Close
-  project_status_closed: chiuso
+  button_reopen: Reopen
-  project_status_archived: archiviato
+  project_status_active: active
-  text_project_closed: Questo progetto è chiuso e in sola lettura.
+  project_status_closed: closed
-  notice_user_successful_create: Creato utente %{id}.
+  project_status_archived: archived
-  field_core_fields: Campi standard
+  text_project_closed: This project is closed and read-only.
-  field_timeout: Timeout (in secondi)
+  notice_user_successful_create: User %{id} created.
-  setting_thumbnails_enabled: Mostra miniature degli allegati
+  field_core_fields: Standard fields
-  setting_thumbnails_size: Dimensioni delle miniature (in pixels)
+  field_timeout: Timeout (in seconds)
-  label_status_transitions: Transizioni di stato
+  setting_thumbnails_enabled: Display attachment thumbnails
-  label_fields_permissions: Permessi sui campi
+  setting_thumbnails_size: Thumbnails size (in pixels)
-  label_readonly: Sola lettura
+  label_status_transitions: Status transitions
-  label_required: Richiesto
+  label_fields_permissions: Fields permissions
-  text_repository_identifier_info: Consentiti solo lettere minuscole (a-z), numeri, trattini e trattini bassi.<br />Una volta salvato, ll'identificatore non può essere modificato.
+  label_readonly: Read-only
+  label_required: Required
+  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
   field_board_parent: Parent forum
   label_attribute_of_project: Project's %{name}
   label_attribute_of_author: Author's %{name}
-  label_attribute_of_assigned_to: Assegnatari %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
   label_attribute_of_fixed_version: Target version's %{name}
-  label_copy_subtasks: Copia sottoattività
+  label_copy_subtasks: Copy subtasks
-  label_copied_to: copia a
+  label_copied_to: copied to
-  label_copied_from: copia da
+  label_copied_from: copied from
-  label_any_issues_in_project: ogni segnalazione del progetto
+  label_any_issues_in_project: any issues in project
-  label_any_issues_not_in_project: ogni segnalazione non nel progetto
+  label_any_issues_not_in_project: any issues not in project
-  field_private_notes: Note private
+  field_private_notes: Private notes
-  permission_view_private_notes: Visualizza note private
+  permission_view_private_notes: View private notes
-  permission_set_notes_private: Imposta note come private
+  permission_set_notes_private: Set notes as private
-  label_no_issues_in_project: progetto privo di segnalazioni
+  label_no_issues_in_project: no issues in project
   label_any: tutti
-  label_last_n_weeks: ultime %{count} settimane
+  label_last_n_weeks: last %{count} weeks
-  setting_cross_project_subtasks: Consenti sottoattività cross-project
+  setting_cross_project_subtasks: Allow cross-project subtasks
   label_cross_project_descendants: Con sottoprogetti
   label_cross_project_tree: Con progetto padre
   label_cross_project_hierarchy: Con gerarchia progetto
   label_cross_project_system: Con tutti i progetti
-  button_hide: Nascondi
+  button_hide: Hide
-  setting_non_working_week_days: Giorni non lavorativi
+  setting_non_working_week_days: Non-working days
-  label_in_the_next_days: nei prossimi
+  label_in_the_next_days: in the next
-  label_in_the_past_days: nei passati
+  label_in_the_past_days: in the past
-  label_attribute_of_user: Utente %{name}
+  label_attribute_of_user: User's %{name}
-  text_turning_multiple_off: Disabilitando valori multipli, i valori multipli verranno rimossi, in modo da mantenere un solo valore per item.
+  text_turning_multiple_off: If you disable multiple values, multiple values will be
-  label_attribute_of_issue: Segnalazione %{name}
+    removed in order to preserve only one value per item.
-  permission_add_documents: Aggiungi documenti
+  label_attribute_of_issue: Issue's %{name}
-  permission_edit_documents: Edita documenti
+  permission_add_documents: Add documents
-  permission_delete_documents: Cancella documenti
+  permission_edit_documents: Edit documents
+  permission_delete_documents: Delete documents
   label_gantt_progress_line: Progress line
-  setting_jsonp_enabled: Abilita supporto a JSONP
+  setting_jsonp_enabled: Enable JSONP support
-  field_inherit_members: Eredita membri
+  field_inherit_members: Inherit members
-  field_closed_on: Chiuso
+  field_closed_on: Closed
-  setting_default_projects_tracker_ids: Trackers di default per nuovi progetti
+  setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Totale

config/locales/ko.yml

@@ -50,8 +50,8 @@ ko:
         one:   "약 한시간"
         other: "약 %{count}시간"
       x_hours:
-        one:   "1 시간"
+        one:   "1 hour"
-        other: "%{count} 시간"
+        other: "%{count} hours"
       x_days:
         one:   "하루"
         other: "%{count}일"

config/locales/lt.yml

@@ -253,6 +253,7 @@ lt:
   error_unable_delete_issue_status: 'Negalima ištrinti darbo statuso'
   error_unable_to_connect: Negalima prisijungti (%{value})
   error_attachment_too_big: "Ši byla negali būti įkelta, nes viršija maksimalią (%{max_size}) leistiną bylos apimtį"
+  error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
   warning_attachments_not_saved: "%{count} byla(ų) negali būti išsaugota."
 
   mail_subject_lost_password: "Jūsų %{value} slaptažodis"

config/locales/lv.yml

@@ -46,8 +46,8 @@ lv:
         one:   "aptuveni 1 stunda"
         other: "aptuveni %{count} stundas"
       x_hours:
-        one:   "1 stunda"
+        one:   "1 hour"
-        other: "%{count} stundas"
+        other: "%{count} hours"
       x_days:
         one:   "1 diena"
         other: "%{count} dienas"
@@ -775,7 +775,7 @@ lv:
   button_cancel: Atcelt
   button_activate: Aktivizēt
   button_sort: Kārtot
-  button_log_time: Reģistrēt laiku
+  button_log_time: Ilgs laiks
   button_rollback: Atjaunot uz šo versiju
   button_watch: Vērot
   button_unwatch: Nevērot

config/locales/mk.yml

@@ -50,8 +50,8 @@ mk:
         one:   "околу 1 час"
         other: "околу %{count} часа"
       x_hours:
-        one:   "1 час"
+        one:   "1 hour"
-        other: "%{count} часа"
+        other: "%{count} hours"
       x_days:
         one:   "1 ден"
         other: "%{count} дена"

config/locales/mn.yml

@@ -51,8 +51,8 @@ mn:
         one:   "1 цаг орчим"
         other: "ойролцоогоор %{count} цаг"
       x_hours:
-        one:   "1 цаг"
+        one:   "1 hour"
-        other: "%{count} цаг"
+        other: "%{count} hours"
       x_days:
         one:   "1 өдөр"
         other: "%{count} өдөр"

config/locales/nl.yml

@@ -50,7 +50,7 @@ nl:
         other: "ongeveer %{count} uren"
       x_hours:
         one:   "1 uur"
-        other: "%{count} uren"
+        other: "%{count} hours"
       x_days:
         one:   "1 dag"
         other: "%{count} dagen"

config/locales/no.yml

@@ -44,8 +44,8 @@
         one: "rundt 1 time"
         other: "rundt %{count} timer"
       x_hours:
-        one:   "1 time"
+        one:   "1 hour"
-        other: "%{count} timer"
+        other: "%{count} hours"
       x_days:
         one: "1 dag"
         other: "%{count} dager"

config/locales/pl.yml

@@ -82,8 +82,8 @@ pl:
         one:   "około godziny"
         other: "około %{count} godzin"
       x_hours:
-        one:   "1 godzina"
+        one:   "1 hour"
-        other: "%{count} godzin"
+        other: "%{count} hours"
       x_days:
         one:   "1 dzień"
         other: "%{count} dni"
@@ -772,7 +772,7 @@ pl:
   text_default_administrator_account_changed: Zmieniono domyślne hasło administratora
   text_destroy_time_entries: Usuń wpisy dziennika
   text_destroy_time_entries_question: Przepracowano %{hours} godzin przy zagadnieniu, które chcesz usunąć. Co chcesz zrobić?
-  text_email_delivery_not_configured: "Dostarczanie poczty elektronicznej nie zostało skonfigurowane, więc powiadamianie jest nieaktywne.\nSkonfiguruj serwer SMTP w config/configuration.yml a następnie zrestartuj aplikację i uaktywnij to."
+  text_email_delivery_not_configured: "Dostarczanie poczty elektronicznej nie zostało skonfigurowane, więc powiadamianie jest nieaktywne.\nSkonfiguruj serwer SMTP w config/email.yml a następnie zrestartuj aplikację i uaktywnij to."
   text_enumeration_category_reassign_to: 'Zmień przypisanie na tą wartość:'
   text_enumeration_destroy_question: "%{count} obiektów jest przypisanych do tej wartości."
   text_file_repository_writable: Zapisywalne repozytorium plików

config/locales/pt-BR.yml

@@ -1105,5 +1105,5 @@ pt-BR:
   setting_jsonp_enabled: Ativar suporte JSONP
   field_inherit_members: Herdar membros
   field_closed_on: Fechado
-  setting_default_projects_tracker_ids: Tipos padrões para novos projeto
+  setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total

config/locales/ro.yml

@@ -45,8 +45,8 @@ ro:
         one:   "aproximativ o oră"
         other: "aproximativ %{count} ore"
       x_hours:
-        one:   "1 oră"
+        one:   "1 hour"
-        other: "%{count} ore"
+        other: "%{count} hours"
       x_days:
         one:   "o zi"
         other: "%{count} zile"

config/locales/sk.yml

@@ -46,8 +46,8 @@ sk:
         one:   "okolo 1 hodiny"
         other: "okolo %{count} hodín"
       x_hours:
-        one:   "1 hodina"
+        one:   "1 hour"
-        other: "%{count} hodín"
+        other: "%{count} hours"
       x_days:
         one:   "1 deň"
         other: "%{count} dní"

config/locales/sl.yml

@@ -50,8 +50,8 @@ sl:
         one:   "okrog 1. ure"
         other: "okrog %{count} ur"
       x_hours:
-        one:   "1 ura"
+        one:   "1 hour"
-        other: "%{count} ur"
+        other: "%{count} hours"
       x_days:
         one:   "1 dan"
         other: "%{count} dni"

config/locales/sq.yml

@@ -50,8 +50,8 @@ sq:
         one:   "about 1 hour"
         other: "about %{count} hours"
       x_hours:
-        one:   "1 ore"
+        one:   "1 hour"
-        other: "%{count} ore"
+        other: "%{count} hours"
       x_days:
         one:   "1 day"
         other: "%{count} days"

config/locales/sr-YU.yml

@@ -53,8 +53,8 @@ sr-YU:
         one:   "približno jedan sat"
         other: "približno %{count} sati"
       x_hours:
-        one:   "1 sat"
+        one:   "1 hour"
-        other: "%{count} sati"
+        other: "%{count} hours"
       x_days:
         one:   "jedan dan"
         other: "%{count} dana"

config/locales/sr.yml

@@ -51,8 +51,8 @@ sr:
         one:   "приближно један сат"
         other: "приближно %{count} сати"
       x_hours:
-        one:   "1 сат"
+        one:   "1 hour"
-        other: "%{count} сати"
+        other: "%{count} hours"
       x_days:
         one:   "један дан"
         other: "%{count} дана"

config/locales/sv.yml

@@ -272,7 +272,6 @@ sv:
   field_author: Författare
   field_created_on: Skapad
   field_updated_on: Uppdaterad
-  field_closed_on: Stängd
   field_field_format: Format
   field_is_for_all: För alla projekt
   field_possible_values: Möjliga värden
@@ -373,7 +372,6 @@ sv:
   field_timeout: "Timeout (i sekunder)"
   field_board_parent: Förälderforum
   field_private_notes: Privata anteckningar
-  field_inherit_members: Ärv medlemmar
 
   setting_app_title: Applikationsrubrik
   setting_app_subtitle: Applikationsunderrubrik
@@ -442,8 +440,6 @@ sv:
   setting_thumbnails_enabled: Visa miniatyrbilder av bilagor
   setting_thumbnails_size: Storlek på miniatyrbilder (i pixlar)
   setting_non_working_week_days: Lediga dagar
-  setting_jsonp_enabled: Aktivera JSONP-stöd
-  setting_default_projects_tracker_ids: Standardärendetyper för nya projekt
 
   permission_add_project: Skapa projekt
   permission_add_subprojects: Skapa underprojekt
@@ -661,7 +657,6 @@ sv:
     one:   1 ärende
     other: "%{count} ärenden"
   label_total: Total
-  label_total_time: Total tid
   label_permissions: Behörigheter
   label_current_status: Nuvarande status
   label_new_statuses_allowed: Nya tillåtna statusvärden
@@ -1125,3 +1120,8 @@ sv:
   description_date_from: Ange startdatum
   description_date_to: Ange slutdatum
   text_repository_identifier_info: 'Endast gemener (a-z), siffror, streck och understreck är tillåtna.<br />När identifieraren sparats kan den inte ändras.'
+  setting_jsonp_enabled: Enable JSONP support
+  field_inherit_members: Inherit members
+  field_closed_on: Closed
+  setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total

config/locales/tr.yml

@@ -56,8 +56,8 @@ tr:
         one: 'yaklaşık 1 saat'
         other: 'yaklaşık %{count} saat'
       x_hours:
-        one:   "1 saat"
+        one:   "1 hour"
-        other: "%{count} saat"
+        other: "%{count} hours"
       x_days:
         one: '1 gün'
         other: '%{count} gün'

config/locales/zh-TW.yml

@@ -123,8 +123,8 @@
         one: "約 1 小時"
         other: "約 %{count} 小時"
       x_hours:
-        one:   "1 小時"
+        one:   "1 hour"
-        other: "%{count} 小時"
+        other: "%{count} hours"
       x_days:
         one: "1 天"
         other: "%{count} 天"

config/routes.rb

@@ -99,11 +99,9 @@ RedmineApp::Application.routes.draw do
       match 'copy', :via => [:get, :post]
     end
 
-    shallow do
+    resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
-      resources :memberships, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
+      collection do
-        collection do
+        get 'autocomplete'
-          get 'autocomplete'
-        end
       end
     end
 
@@ -136,16 +134,12 @@ RedmineApp::Application.routes.draw do
       get 'report', :on => :collection
     end
     resources :queries, :only => [:new, :create]
-    shallow do
+    resources :issue_categories, :shallow => true
-      resources :issue_categories
-    end
     resources :documents, :except => [:show, :edit, :update, :destroy]
     resources :boards
-    shallow do
+    resources :repositories, :shallow => true, :except => [:index, :show] do
-      resources :repositories, :except => [:index, :show] do
+      member do
-        member do
+        match 'committers', :via => [:get, :post]
-          match 'committers', :via => [:get, :post]
-        end
       end
     end
 
@@ -182,9 +176,7 @@ RedmineApp::Application.routes.draw do
         get 'report'
       end
     end
-    shallow do
+    resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
-      resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
-    end
   end
   match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
 

doc/CHANGELOG

@@ -4,34 +4,6 @@ Redmine - project management software
 Copyright (C) 2006-2013  Jean-Philippe Lang
 http://www.redmine.org/
 
-== 2013-07-14 v2.3.2
-
-* Defect #9996: configuration.yml in documentation , but redmine ask me to create email.yml
-* Defect #13692: warning: already initialized constant on Ruby 1.8.7
-* Defect #13783: Internal error on time tracking activity enumeration deletion
-* Defect #13821: "obj" parameter is not defined for macros used in description of documents
-* Defect #13850: Unable to set custom fields for versions using the REST API
-* Defect #13910: Values of custom fields are not kept in issues when copying a project
-* Defect #13950: Duplicate Lithuanian "error_attachment_too_big" translation keys
-* Defect #14015: Ruby hangs when adding a subtask
-* Defect #14020: Locking and unlocking a user resets the email notification checkbox
-* Defect #14023: Can't delete relation when Redmine runs in a subpath
-* Defect #14051: Filtering issues with custom field in date format with NULL(empty) value
-* Defect #14178: PDF API broken in version 2.3.1
-* Defect #14186: Project name is not properly escaped in issue filters JSON
-* Defect #14242: Project auto generation fails when projects created in the same time
-* Defect #14245: Gem::InstallError: nokogiri requires Ruby version >= 1.9.2.
-* Defect #14346: Latvian translation for "Log time"
-* Feature #12888: Adding markings to emails generated by Private comments
-* Feature #14419: Include RUBY_PATCHLEVEL and RUBY_RELEASE_DATE in info.rb
-* Patch #14005: Swedish Translation for 2.3-stable
-* Patch #14101: Receive IMAP by uid's
-* Patch #14103: Disconnect and logout from IMAP after mail receive
-* Patch #14145: German translation of x_hours
-* Patch #14182: pt-BR translation for 2.3-stable
-* Patch #14196: Italian translation for 2.3-stable
-* Patch #14221: Translation of x_hours for many languages
-
 == 2013-05-01 v2.3.1
 
 * Defect #12650: Lost text after selection in issue list with IE

lib/redmine/export/pdf.rb

@@ -394,7 +394,7 @@ module Redmine
 
         # write the cells on page
         issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true)
-        issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width)
+        issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_width)
         pdf.SetY(base_y + max_height);
 
         # rows
@@ -474,7 +474,7 @@ module Redmine
 
           # write the cells on page
           issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
-          issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width)
+          issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_width)
           pdf.SetY(base_y + max_height);
 
           if query.has_column?(:description) && issue.description?
@@ -511,10 +511,7 @@ module Redmine
       end
 
       # Draw lines to close the row (MultiCell border drawing in not uniform)
-      #
+      def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y, col_widths)
-      #  parameter "col_id_width" is not used. it is kept for compatibility.
-      def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y,
-                                     col_id_width, col_widths)
         col_x = top_x
         pdf.Line(col_x, top_y, col_x, lower_y)    # id right border
         col_widths.each do |width|

lib/redmine/helpers/gantt.rb

@@ -675,7 +675,7 @@ module Redmine
         start_date + (end_date - start_date + 1) * (progress / 100.0)
       end
 
-      # TODO: Sorts a collection of issues by start_date, due_date, id for gantt rendering
+      # Sorts a collection of issues by start_date, due_date, id for gantt rendering
       def sort_issues!(issues)
         issues.sort! { |a, b| gantt_issue_compare(a, b) }
       end

lib/redmine/imap.rb

@@ -29,27 +29,25 @@ module Redmine
         imap = Net::IMAP.new(host, port, ssl)
         imap.login(imap_options[:username], imap_options[:password]) unless imap_options[:username].nil?
         imap.select(folder)
-        imap.uid_search(['NOT', 'SEEN']).each do |uid|
+        imap.search(['NOT', 'SEEN']).each do |message_id|
-          msg = imap.uid_fetch(uid,'RFC822')[0].attr['RFC822']
+          msg = imap.fetch(message_id,'RFC822')[0].attr['RFC822']
-          logger.debug "Receiving message #{uid}" if logger && logger.debug?
+          logger.debug "Receiving message #{message_id}" if logger && logger.debug?
           if MailHandler.receive(msg, options)
-            logger.debug "Message #{uid} successfully received" if logger && logger.debug?
+            logger.debug "Message #{message_id} successfully received" if logger && logger.debug?
             if imap_options[:move_on_success]
-              imap.uid_copy(uid, imap_options[:move_on_success])
+              imap.copy(message_id, imap_options[:move_on_success])
             end
-            imap.uid_store(uid, "+FLAGS", [:Seen, :Deleted])
+            imap.store(message_id, "+FLAGS", [:Seen, :Deleted])
           else
-            logger.debug "Message #{uid} can not be processed" if logger && logger.debug?
+            logger.debug "Message #{message_id} can not be processed" if logger && logger.debug?
-            imap.uid_store(uid, "+FLAGS", [:Seen])
+            imap.store(message_id, "+FLAGS", [:Seen])
             if imap_options[:move_on_failure]
-              imap.uid_copy(uid, imap_options[:move_on_failure])
+              imap.copy(message_id, imap_options[:move_on_failure])
-              imap.uid_store(uid, "+FLAGS", [:Deleted])
+              imap.store(message_id, "+FLAGS", [:Deleted])
             end
           end
         end
         imap.expunge
-        imap.logout
-        imap.disconnect
       end
 
       private

lib/redmine/info.rb

@@ -10,16 +10,16 @@ module Redmine
         s = "Environment:\n"
         s << [
           ["Redmine version", Redmine::VERSION],
-          ["Ruby version", "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"],
+          ["Ruby version", "#{RUBY_VERSION} (#{RUBY_PLATFORM})"],
           ["Rails version", Rails::VERSION::STRING],
           ["Environment", Rails.env],
           ["Database adapter", ActiveRecord::Base.connection.adapter_name]
-        ].map {|info| "  %-30s %s" % info}.join("\n")
+        ].map {|info| "  %-40s %s" % info}.join("\n")
         s << "\nRedmine plugins:\n"
 
         plugins = Redmine::Plugin.all
         if plugins.any?
-          s << plugins.map {|plugin| "  %-30s %s" % [plugin.id.to_s, plugin.version.to_s]}.join("\n")
+          s << plugins.map {|plugin| "  %-40s %s" % [plugin.id.to_s, plugin.version.to_s]}.join("\n")
         else
           s << "  no plugin installed"
         end

lib/redmine/syntax_highlighting.rb

@@ -33,6 +33,7 @@ module Redmine
 
     module CodeRay
       require 'coderay'
+      require 'coderay/helpers/file_type'
 
       class << self
         # Highlights +text+ as the content of +filename+

lib/redmine/version.rb

@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 2
+    TINY  = 1
 
     # Branch values:
     # * official release: nil

test/functional/admin_controller_test.rb

@@ -83,7 +83,7 @@ class AdminControllerTest < ActionController::TestCase
 
   def test_test_email
     user = User.find(1)
-    user.pref.no_self_notified = '1'
+    user.pref[:no_self_notified] = '1'
     user.pref.save!
     ActionMailer::Base.deliveries.clear
 

test/functional/enumerations_controller_test.rb

@@ -126,11 +126,4 @@ class EnumerationsControllerTest < ActionController::TestCase
     # check that the issue was reassign
     assert_equal 6, issue.reload.priority_id
   end
-
-  def test_destroy_enumeration_in_use_with_blank_reassignment
-    assert_no_difference 'IssuePriority.count' do
-      delete :destroy, :id => 4, :reassign_to_id => ''
-    end
-    assert_response :success
-  end
 end

test/functional/users_controller_test.rb

@@ -325,18 +325,6 @@ class UsersControllerTest < ActionController::TestCase
     assert_equal [1, 2], u.notified_projects_ids.sort
   end
 
-  def test_update_status_should_not_update_attributes
-    user = User.find(2)
-    user.pref[:no_self_notified] = '1'
-    user.pref.save
-
-    put :update, :id => 2, :user => {:status => 3}
-    assert_response 302
-    user = User.find(2)
-    assert_equal 3, user.status
-    assert_equal '1', user.pref[:no_self_notified]
-  end
-
   def test_destroy
     assert_difference 'User.count', -1 do
       delete :destroy, :id => 2

test/integration/api_test/versions_test.rb

@@ -82,29 +82,6 @@ class Redmine::ApiTest::VersionsTest < Redmine::ApiTest::Base
         assert_tag 'version', :child => {:tag => 'id', :content => version.id.to_s}
       end
 
-      should "create the version with custom fields" do
-        field = VersionCustomField.generate!
-
-        assert_difference 'Version.count' do
-          post '/projects/1/versions.xml', {
-              :version => {
-                :name => 'API test',
-                :custom_fields => [
-                  {'id' => field.id.to_s, 'value' => 'Some value'}
-                ]
-              }
-            }, credentials('jsmith')
-        end
-
-        version = Version.first(:order => 'id DESC')
-        assert_equal 'API test', version.name
-        assert_equal 'Some value', version.custom_field_value(field)
-
-        assert_response :created
-        assert_equal 'application/xml', @response.content_type
-        assert_select 'version>custom_fields>custom_field[id=?]>value', field.id.to_s, 'Some value'
-      end
-
       context "with failure" do
         should "return the errors" do
           assert_no_difference('Version.count') do

test/object_helpers.rb

@@ -107,11 +107,10 @@ module ObjectHelpers
   def TimeEntry.generate!(attributes={})
     entry = TimeEntry.new(attributes)
     entry.user ||= User.find(2)
-    entry.issue ||= Issue.find(1) unless entry.project
+    entry.issue ||= Issue.find(1)
     entry.project ||= entry.issue.project
     entry.activity ||= TimeEntryActivity.first
     entry.spent_on ||= Date.today
-    entry.hours ||= 1.0
     entry.save!
     entry
   end
@@ -148,15 +147,4 @@ module ObjectHelpers
     attachment.save!
     attachment
   end
-
-  def CustomField.generate!(attributes={})
-    @generated_custom_field_name ||= 'Custom field 0'
-    @generated_custom_field_name.succ!
-    field = new(attributes)
-    field.name = @generated_custom_field_name.dup if field.name.blank?
-    field.field_format = 'string' if field.field_format.blank?
-    yield field if block_given?
-    field.save!
-    field
-  end
 end

test/unit/helpers/application_helper_test.rb

@@ -1210,14 +1210,4 @@ RAW
   def test_javascript_include_tag_for_plugin_should_pick_the_plugin_javascript
     assert_match 'src="/plugin_assets/foo/javascripts/scripts.js"', javascript_include_tag("scripts", :plugin => :foo)
   end
-
-  def test_raw_json_should_escape_closing_tags
-    s = raw_json(["<foo>bar</foo>"])
-    assert_equal '["<foo>bar<\/foo>"]', s
-  end
-
-  def test_raw_json_should_be_html_safe
-    s = raw_json(["foo"])
-    assert s.html_safe?
-  end
 end

test/unit/issue_test.rb

@@ -1792,136 +1792,6 @@ class IssueTest < ActiveSupport::TestCase
     assert_equal [2, 3, 8], Issue.find(1).all_dependent_issues.collect(&:id).sort
   end
 
-  def test_all_dependent_issues_with_subtask
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-    
-    parentIssue = Issue.generate!(:project => project)
-    childIssue1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue.id)
-    childIssue2 = Issue.generate!(:project => project, :parent_issue_id => parentIssue.id)
-
-    assert_equal [childIssue1.id, childIssue2.id].sort, parentIssue.all_dependent_issues.collect(&:id).uniq.sort
-  end
-
-  def test_all_dependent_issues_does_not_include_self
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-
-    parentIssue = Issue.generate!(:project => project)
-    childIssue = Issue.generate!(:project => project, :parent_issue_id => parentIssue.id)
-
-    assert_equal [childIssue.id], parentIssue.all_dependent_issues.collect(&:id)
-  end
-
-  def test_all_dependent_issues_with_parenttask_and_sibling
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-
-    parentIssue = Issue.generate!(:project => project)
-    childIssue1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue.id)
-    childIssue2 = Issue.generate!(:project => project, :parent_issue_id => parentIssue.id)
-
-    assert_equal [parentIssue.id].sort, childIssue1.all_dependent_issues.collect(&:id)
-  end
-
-  def test_all_dependent_issues_with_relation_to_leaf_in_other_tree
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-
-    parentIssue1 = Issue.generate!(:project => project)
-    childIssue1_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue1.id)
-    childIssue1_2 = Issue.generate!(:project => project, :parent_issue_id => parentIssue1.id)
-
-    parentIssue2 = Issue.generate!(:project => project)
-    childIssue2_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue2.id)
-    childIssue2_2 = Issue.generate!(:project => project, :parent_issue_id => parentIssue2.id)
-
-
-    assert IssueRelation.create(:issue_from => parentIssue1,
-                                :issue_to   => childIssue2_2,
-                                :relation_type => IssueRelation::TYPE_BLOCKS)
-
-    assert_equal [childIssue1_1.id, childIssue1_2.id, parentIssue2.id, childIssue2_2.id].sort,
-                 parentIssue1.all_dependent_issues.collect(&:id).uniq.sort
-  end
-
-  def test_all_dependent_issues_with_relation_to_parent_in_other_tree
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-
-    parentIssue1 = Issue.generate!(:project => project)
-    childIssue1_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue1.id)
-    childIssue1_2 = Issue.generate!(:project => project, :parent_issue_id => parentIssue1.id)
-
-    parentIssue2 = Issue.generate!(:project => project)
-    childIssue2_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue2.id)
-    childIssue2_2 = Issue.generate!(:project => project, :parent_issue_id => parentIssue2.id)
-
-
-    assert IssueRelation.create(:issue_from => parentIssue1,
-                                :issue_to   => parentIssue2,
-                                :relation_type => IssueRelation::TYPE_BLOCKS)
-
-    assert_equal [childIssue1_1.id, childIssue1_2.id, parentIssue2.id, childIssue2_1.id, childIssue2_2.id].sort,
-                 parentIssue1.all_dependent_issues.collect(&:id).uniq.sort
-  end
-
-  def test_all_dependent_issues_with_transitive_relation
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-
-    parentIssue1 = Issue.generate!(:project => project)
-    childIssue1_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue1.id)
-
-    parentIssue2 = Issue.generate!(:project => project)
-    childIssue2_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue2.id)
-
-    independentIssue = Issue.generate!(:project => project)
-
-    assert IssueRelation.create(:issue_from => parentIssue1,
-                                :issue_to   => childIssue2_1,
-                                :relation_type => IssueRelation::TYPE_RELATES)
-
-    assert IssueRelation.create(:issue_from => childIssue2_1,
-                                :issue_to   => independentIssue,
-                                :relation_type => IssueRelation::TYPE_RELATES)
-
-    assert_equal [childIssue1_1.id, parentIssue2.id, childIssue2_1.id, independentIssue.id].sort,
-                 parentIssue1.all_dependent_issues.collect(&:id).uniq.sort
-  end
-
-  def test_all_dependent_issues_with_transitive_relation2
-    IssueRelation.delete_all
-
-    project = Project.generate!(:name => "testproject")
-
-    parentIssue1 = Issue.generate!(:project => project)
-    childIssue1_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue1.id)
-
-    parentIssue2 = Issue.generate!(:project => project)
-    childIssue2_1 = Issue.generate!(:project => project, :parent_issue_id => parentIssue2.id)
-
-    independentIssue = Issue.generate!(:project => project)
-
-    assert IssueRelation.create(:issue_from => parentIssue1,
-                                :issue_to   => independentIssue,
-                                :relation_type => IssueRelation::TYPE_RELATES)
-
-    assert IssueRelation.create(:issue_from => independentIssue,
-                                :issue_to   => childIssue2_1,
-                                :relation_type => IssueRelation::TYPE_RELATES)
-
-    assert_equal [childIssue1_1.id, parentIssue2.id, childIssue2_1.id, independentIssue.id].sort,
-                 parentIssue1.all_dependent_issues.collect(&:id).uniq.sort
-
-  end
-
   def test_all_dependent_issues_with_persistent_circular_dependency
     IssueRelation.delete_all
     assert IssueRelation.create!(:issue_from => Issue.find(1),

test/unit/mailer_test.rb

@@ -215,14 +215,14 @@ class MailerTest < ActiveSupport::TestCase
     # Remove members except news author
     news.project.memberships.each {|m| m.destroy unless m.user == user}
 
-    user.pref.no_self_notified = false
+    user.pref[:no_self_notified] = false
     user.pref.save
     User.current = user
     Mailer.news_added(news.reload).deliver
     assert_equal 1, last_email.bcc.size
 
     # nobody to notify
-    user.pref.no_self_notified = true
+    user.pref[:no_self_notified] = true
     user.pref.save
     User.current = user
     ActionMailer::Base.deliveries.clear
@@ -296,7 +296,7 @@ class MailerTest < ActiveSupport::TestCase
     issue = Issue.find(1)
     user = User.find(9)
     # minimal email notification options
-    user.pref.no_self_notified = '1'
+    user.pref[:no_self_notified] = '1'
     user.pref.save
     user.mail_notification = false
     user.save
@@ -361,17 +361,6 @@ class MailerTest < ActiveSupport::TestCase
     assert_not_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort
   end
 
-  def test_issue_edit_should_mark_private_notes
-    journal = Journal.find(2)
-    journal.private_notes = true
-    journal.save!
-
-    with_settings :default_language => 'en' do
-      Mailer.issue_edit(journal).deliver
-    end
-    assert_mail_body_match '(Private notes)', last_email
-  end
-
   def test_document_added
     document = Document.find(1)
     valid_languages.each do |lang|

test/unit/project_copy_test.rb

@@ -69,19 +69,6 @@ class ProjectCopyTest < ActiveSupport::TestCase
     assert_equal "Closed", copied_issue.status.name
   end
 
-  test "#copy should copy issues custom values" do
-    field = IssueCustomField.generate!(:is_for_all => true, :trackers => Tracker.all)
-    issue = Issue.generate!(:project => @source_project, :subject => 'Custom field copy')
-    issue.custom_field_values = {field.id => 'custom'}
-    issue.save!
-    assert_equal 'custom', issue.reload.custom_field_value(field)
-
-    assert @project.copy(@source_project)
-    copy = @project.issues.find_by_subject('Custom field copy')
-    assert copy
-    assert_equal 'custom', copy.reload.custom_field_value(field)
-  end
-
   test "#copy should copy issues assigned to a locked version" do
     User.current = User.find(1)
     assigned_version = Version.generate!(:name => "Assigned Issues")

test/unit/query_test.rb

@@ -337,20 +337,6 @@ class QueryTest < ActiveSupport::TestCase
     find_issues_with_query(query)
   end
 
-  def test_operator_lesser_than_on_date_custom_field
-    f = IssueCustomField.create!(:name => 'filter', :field_format => 'date', :is_filter => true, :is_for_all => true)
-    CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '2013-04-11')
-    CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '2013-05-14')
-    CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
-
-    query = IssueQuery.new(:project => Project.find(1), :name => '_')
-    query.add_filter("cf_#{f.id}", '<=', ['2013-05-01'])
-    issue_ids = find_issues_with_query(query).map(&:id)
-    assert_include 1, issue_ids
-    assert_not_include 2, issue_ids
-    assert_not_include 3, issue_ids
-  end
-
   def test_operator_between
     query = IssueQuery.new(:project => Project.find(1), :name => '_')
     query.add_filter('done_ratio', '><', ['30', '40'])

test/unit/time_entry_activity_test.rb

@@ -84,33 +84,5 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
     e.reload
     assert_equal "0", e.custom_value_for(field).value
   end
-
-  def test_system_activity_with_child_in_use_should_be_in_use
-    project = Project.generate!
-    system_activity = TimeEntryActivity.create!(:name => 'Activity')
-    project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
-
-    TimeEntry.generate!(:project => project, :activity => project_activity)
-
-    assert project_activity.in_use?
-    assert system_activity.in_use?
-  end
-
-  def test_destroying_a_system_activity_should_reassign_children_activities
-    project = Project.generate!
-    system_activity = TimeEntryActivity.create!(:name => 'Activity')
-    project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
-
-    entries = [
-      TimeEntry.generate!(:project => project, :activity => system_activity),
-      TimeEntry.generate!(:project => project, :activity => project_activity)
-    ]
-
-    assert_difference 'TimeEntryActivity.count', -2 do
-      assert_nothing_raised do
-        assert system_activity.destroy(TimeEntryActivity.find_by_name('Development'))
-      end
-    end
-    assert entries.all? {|entry| entry.reload.activity.name == 'Development'}
-  end
 end
+