tagged version 2.1.2

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/2.1.2@10537 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 10:43:39 +00:00
54 changed files with 208 additions and 691 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@
 /public/plugin_assets
 /tmp/*
 /tmp/cache/*
-/tmp/pdf/*
 /tmp/sessions/*
 /tmp/sockets/*
 /tmp/test/*
--- a/.hgignore
+++ b/.hgignore
@@ -21,7 +21,6 @@ public/dispatch.*
 public/plugin_assets
 tmp/*
 tmp/cache/*
-tmp/pdf/*
 tmp/sessions/*
 tmp/sockets/*
 tmp/test/*
--- a/2
+++ b/2
@@ -41,7 +41,7 @@ end

 platforms :mri_18, :mingw_18 do
  group :mysql do
-    gem "mysql", "~> 2.8.1"
+    gem "mysql"
  end
 end

--- a/app/controllers/previews_controller.rb
+++ b/app/controllers/previews_controller.rb
@@ -26,8 +26,7 @@ class PreviewsController < ApplicationController
      if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
        @description = nil
      end
-      # params[:notes] is useful for preview of notes in issue history
-      @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
+      @notes = params[:notes]
    else
      @description = (params[:issue] ? params[:issue][:description] : nil)
    end
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -239,7 +239,7 @@ class WikiController < ApplicationController

  # Export wiki to a single pdf or html file
  def export
-    @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments])
+    @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments], :limit => 75)
    respond_to do |format|
      format.html {
        export = render_to_string :action => 'export_multiple', :layout => false
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -795,10 +795,11 @@ module ApplicationHelper
                if repository && User.current.allowed_to?(:browse_repository, project)
                  name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                  path, rev, anchor = $1, $3, $5
-                  link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
+                  link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :repository_id => repository.identifier_param,
                                                          :path => to_path_param(path),
                                                          :rev => rev,
-                                                          :anchor => anchor},
+                                                          :anchor => anchor,
+                                                          :format => (prefix == 'export' ? 'raw' : nil)},
                                                         :class => (prefix == 'export' ? 'source download' : 'source')
                end
              end
--- a/app/helpers/context_menus_helper.rb
+++ b/app/helpers/context_menus_helper.rb
@@ -26,8 +26,8 @@ module ContextMenusHelper
    end
    if options.delete(:disabled)
      options.delete(:method)
-      options.delete(:data)
-      options[:onclick] = 'return false;'
+      options.delete(:confirm)
+      options.delete(:onclick)
      options[:class] << ' disabled'
      url = '#'
    end
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -130,13 +130,7 @@ class CustomField < ActiveRecord::Base
    possible_values_options = possible_values_options(customized)
    if possible_values_options.present?
      keyword = keyword.to_s.downcase
-      if v = possible_values_options.detect {|text, id| text.downcase == keyword}
-        if v.is_a?(Array)
-          v.last
-        else
-          v
-        end
-      end
+      possible_values_options.detect {|text, id| text.downcase == keyword}.try(:last)
    else
      keyword
    end
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -124,7 +124,6 @@ class MailHandler < ActionMailer::Base

  def dispatch
    headers = [email.in_reply_to, email.references].flatten.compact
-    subject = email.subject.to_s
    if headers.detect {|h| h.to_s =~ MESSAGE_ID_RE}
      klass, object_id = $1, $2.to_i
      method_name = "receive_#{klass}_reply"
@@ -133,9 +132,9 @@ class MailHandler < ActionMailer::Base
      else
        # ignoring it
      end
-    elsif m = subject.match(ISSUE_REPLY_SUBJECT_RE)
+    elsif m = email.subject.match(ISSUE_REPLY_SUBJECT_RE)
      receive_issue_reply(m[1].to_i)
-    elsif m = subject.match(MESSAGE_REPLY_SUBJECT_RE)
+    elsif m = email.subject.match(MESSAGE_REPLY_SUBJECT_RE)
      receive_message_reply(m[1].to_i)
    else
      dispatch_to_default
@@ -245,26 +244,9 @@ class MailHandler < ActionMailer::Base
  def add_attachments(obj)
    if email.attachments && email.attachments.any?
      email.attachments.each do |attachment|
-        filename = attachment.filename
-        unless filename.respond_to?(:encoding)
-          # try to reencode to utf8 manually with ruby1.8
-          h = attachment.header['Content-Disposition']
-          unless h.nil?
-            begin
-              if m = h.value.match(/filename\*[0-9\*]*=([^=']+)'/)
-                filename = Redmine::CodesetUtil.to_utf8(filename, m[1])
-              elsif m = h.value.match(/filename=.*=\?([^\?]+)\?[BbQq]\?/)
-                # http://tools.ietf.org/html/rfc2047#section-4
-                filename = Redmine::CodesetUtil.to_utf8(filename, m[1])
-              end
-            rescue
-              # nop
-            end
-          end
-        end
        obj.attachments << Attachment.create(:container => obj,
                          :file => attachment.decoded,
-                          :filename => filename,
+                          :filename => attachment.filename,
                          :author => user,
                          :content_type => attachment.mime_type)
      end
@@ -391,8 +373,7 @@ class MailHandler < ActionMailer::Base
      # try to reencode to utf8 manually with ruby1.8
      begin
        if h = email.header[:subject]
-          # http://tools.ietf.org/html/rfc2047#section-4
-          if m = h.value.match(/=\?([^\?]+)\?[BbQq]\?/)
+          if m = h.value.match(/^=\?([^\?]+)\?/)
            subject = Redmine::CodesetUtil.to_utf8(subject, m[1])
          end
        end
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -30,13 +30,13 @@ class Principal < ActiveRecord::Base
    if q.blank?
      {}
    else
-      q = q.to_s
+      q = q.to_s.downcase
      pattern = "%#{q}%"
-      sql = "LOWER(login) LIKE LOWER(:p) OR LOWER(firstname) LIKE LOWER(:p) OR LOWER(lastname) LIKE LOWER(:p) OR LOWER(mail) LIKE LOWER(:p)"
+      sql = "LOWER(login) LIKE :p OR LOWER(firstname) LIKE :p OR LOWER(lastname) LIKE :p OR LOWER(mail) LIKE :p"
      params = {:p => pattern}
      if q =~ /^(.+)\s+(.+)$/
        a, b = "#{$1}%", "#{$2}%"
-        sql << " OR (LOWER(firstname) LIKE LOWER(:a) AND LOWER(lastname) LIKE LOWER(:b)) OR (LOWER(firstname) LIKE LOWER(:b) AND LOWER(lastname) LIKE LOWER(:a))"
+        sql << " OR (LOWER(firstname) LIKE :a AND LOWER(lastname) LIKE :b) OR (LOWER(firstname) LIKE :b AND LOWER(lastname) LIKE :a)"
        params.merge!(:a => a, :b => b)
      end
      {:conditions => [sql, params]}
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -427,9 +427,5 @@ class Repository < ActiveRecord::Base
    connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
    connection.delete("DELETE FROM #{cp} WHERE #{cp}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
    connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
-    clear_extra_info_of_changesets
-  end
-
-  def clear_extra_info_of_changesets
  end
 end
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -255,15 +255,4 @@ class Repository::Git < Repository
      :order => 'committed_on DESC'
    )
  end
-
-  def clear_extra_info_of_changesets
-    return if extra_info.nil?
-    v = extra_info["extra_report_last_commit"]
-    write_attribute(:extra_info, nil)
-    h = {}
-    h["extra_report_last_commit"] = v
-    merge_extra_info(h)
-    self.save
-  end
-  private :clear_extra_info_of_changesets
 end
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -33,7 +33,6 @@ class Version < ActiveRecord::Base
  validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :not_a_date, :allow_nil => true
  validates_inclusion_of :status, :in => VERSION_STATUSES
  validates_inclusion_of :sharing, :in => VERSION_SHARINGS
-  validate :validate_version

  scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
  scope :open, :conditions => {:status => 'open'}
@@ -276,10 +275,4 @@ class Version < ActiveRecord::Base
      progress
    end
  end
-
-  def validate_version
-    if effective_date.nil? && @attributes['effective_date'].present?
-      errors.add :effective_date, :not_a_date
-    end
-  end
 end
--- a/app/views/common/error.html.erb
+++ b/app/views/common/error.html.erb
@@ -3,6 +3,6 @@
 <% if @message.present? %>
  <p id="errorExplanation"><%=h @message %></p>
 <% end %>
-<p><a href="javascript:history.back()"><%= l(:button_back) %></a></p>
+<p><a href="javascript:history.back()">Back</a></p>

 <% html_title @status %>
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -19,7 +19,7 @@
    <tr class="group open">
      <td colspan="<%= query.columns.size + 2 %>">
        <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
-        <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
+        <%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
        <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
      </td>
    </tr>
--- a/app/views/journals/edit.js.erb
+++ b/app/views/journals/edit.js.erb
@@ -1,8 +1,2 @@
 $("#journal-<%= @journal.id %>-notes").hide();
-
-if ($("form#journal-<%= @journal.id %>-form").length > 0) {
-  // journal edit form already loaded
-  $("#journal-<%= @journal.id %>-form").show();
-} else {
-  $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
-}
+$("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -14,7 +14,7 @@
    <tr class="<%= cycle 'odd', 'even' %>">
      <td>
      <%= link_to repository.identifier, 
-            {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %>
+            {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier_param.present? %>
      </td>
      <td align="center"><%= checked_image repository.is_default? %></td>
      <td><%=h repository.scm_name %></td>
--- a/app/views/repositories/revisions.html.erb
+++ b/app/views/repositories/revisions.html.erb
@@ -1,8 +1,7 @@
 <div class="contextual">
 <%= form_tag(
       {:controller => 'repositories', :action => 'revision', :id => @project,
-        :repository_id => @repository.identifier_param},
-       :method => :get
+        :repository_id => @repository.identifier_param}
     ) do %>
  <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
  <%= submit_tag 'OK' %>
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -844,7 +844,7 @@ de:
  button_show: Anzeigen

  status_active: aktiv
-  status_registered: nicht aktivierte
+  status_registered: angemeldet
  status_locked: gesperrt

  version_status_open: offen
@@ -1017,8 +1017,8 @@ de:
  description_date_from: Startdatum eintragen
  description_date_to: Enddatum eintragen

-  label_parent_revision: Vorgänger
-  label_child_revision: Nachfolger
+  label_parent_revision: Parent
+  label_child_revision: Child
  error_scm_annotate_big_text_file: Der Eintrag kann nicht umgesetzt werden, da er die maximale Textlänge überschreitet.
  setting_default_issue_start_date_to_creation_date: Aktuelles Datum als Beginn für neue Tickets verwenden
  button_edit_section: Diesen Bereich bearbeiten
@@ -1068,14 +1068,14 @@ de:
  field_timeout: Auszeit (in Sekunden)
  setting_thumbnails_enabled: Vorschaubilder von Dateianhängen anzeigen
  setting_thumbnails_size: Größe der Vorschaubilder (in Pixel)
-  label_status_transitions: Statusänderungen
-  label_fields_permissions: Feldberechtigungen
+  label_status_transitions: Status transitions
+  label_fields_permissions: Fields permissions
  label_readonly: Nur-Lese-Zugriff
  label_required: Erforderlich
  text_repository_identifier_info: 'Kleinbuchstaben (a-z), Ziffern, Binde- und Unterstriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.'
-  field_board_parent: Übergeordnetes Forum
-  label_attribute_of_project: "%{name} des Projekts"
-  label_attribute_of_author: "%{name} des Autors"
-  label_attribute_of_assigned_to: "%{name} des Bearbeiters"
-  label_attribute_of_fixed_version: "%{name} der Zielversion"
-  label_copy_subtasks: Unteraufgaben kopieren
+  field_board_parent: Parent forum
+  label_attribute_of_project: Project's %{name}
+  label_attribute_of_author: Author's %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
+  label_copy_subtasks: Copy subtasks
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -49,7 +49,7 @@ nl:
        one:   "ongeveer 1 uur"
        other: "ongeveer %{count} uren"
      x_hours:
-        one:   "1 uur"
+        one:   "1 hour"
        other: "%{count} hours"
      x_days:
        one:   "1 dag"
@@ -990,58 +990,58 @@ nl:
  description_all_columns: Alle kolommen
  button_export: Exporteren
  label_export_options: "%{export_format} export opties"
-  error_attachment_too_big: Dit bestand kan niet worden geupload omdat het de maximaal toegestane grootte overschrijd (%{max_size})
-  notice_failed_to_save_time_entries: "Opslaan gefaald voor %{count} tijdsnotatie(s) van %{total} geselecteerde: %{ids}."
+  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
+  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
  label_x_issues:
-    zero:  0 incidenten
-    one:   1 incidenten
-    other: "%{count} incidenten"
-  label_repository_new: Nieuw repository
-  field_repository_is_default: Hoofd repository
-  label_copy_attachments: Copieer bijlage(n)
+    zero:  0 issue
+    one:   1 issue
+    other: "%{count} issues"
+  label_repository_new: New repository
+  field_repository_is_default: Main repository
+  label_copy_attachments: Copy attachments
  label_item_position: "%{position}/%{count}"
-  label_completed_versions: Versies compleet
-  field_multiple: Meerdere waardes
-  setting_commit_cross_project_ref: Sta toe om incidenten van alle projecten te refereren en oplossen
-  text_issue_conflict_resolution_add_notes: Voeg mijn notities toe en annuleer andere wijzigingen
-  text_issue_conflict_resolution_overwrite: Voeg mijn wijzigingen alsnog toe (voorgaande notities worden bewaard, maar sommige kunnen overschreden worden)
-  notice_issue_update_conflict: Dit incident is reeds geupdate door een andere gebruiker terwijl jij bezig was
-  text_issue_conflict_resolution_cancel: Annuleer mijn wijzigingen en geef pagina opnieuw weer %{link}
-  permission_manage_related_issues: Beheer gerelateerde incidenten
+  label_completed_versions: Completed versions
+  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: Add my notes and discard my other changes
+  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
+  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  permission_manage_related_issues: Manage related issues
  field_auth_source_ldap_filter: LDAP filter
-  label_search_for_watchers: Zoek om monitoorders toe te voegen
-  notice_account_deleted: Uw account is permanent verwijderd
-  setting_unsubscribe: Sta gebruikers toe hun eigen account te verwijderen
-  button_delete_my_account: Verwijder mijn account
+  label_search_for_watchers: Search for watchers to add
+  notice_account_deleted: Your account has been permanently deleted.
+  setting_unsubscribe: Allow users to delete their own account
+  button_delete_my_account: Delete my account
  text_account_destroy_confirmation: |-
-    Weet u zeker dat u door wilt gaan?
-    Uw account wordt permanent verwijderd zonder mogelijkheid deze te heractiveren.
-  error_session_expired: Uw sessie is verlopen. U dient opnieuw in te loggen.
-  text_session_expiration_settings: "Waarschuwing: door deze instelling te wijzigen kan sessies laten verlopen inclusief de uwe"
-  setting_session_lifetime: Maximale sessieduur
-  setting_session_timeout: Sessie inactiviteit timeout
-  label_session_expiration: Sessie verlopen
-  permission_close_project: Sluit / heropen project
-  label_show_closed_projects: Gesloten projecten weergeven
-  button_close: Sluiten
-  button_reopen: Heropen
-  project_status_active: actief
-  project_status_closed: gesloten
-  project_status_archived: gearchiveerd
-  text_project_closed: Dit project is gesloten en op alleen-lezen
-  notice_user_successful_create: Gebruiker %{id} aangemaakt.
-  field_core_fields: Standaard verleden
+    Are you sure you want to proceed?
+    Your account will be permanently deleted, with no way to reactivate it.
+  error_session_expired: Your session has expired. Please login again.
+  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  setting_session_lifetime: Session maximum lifetime
+  setting_session_timeout: Session inactivity timeout
+  label_session_expiration: Session expiration
+  permission_close_project: Close / reopen the project
+  label_show_closed_projects: View closed projects
+  button_close: Close
+  button_reopen: Reopen
+  project_status_active: active
+  project_status_closed: closed
+  project_status_archived: archived
+  text_project_closed: This project is closed and read-only.
+  notice_user_successful_create: User %{id} created.
+  field_core_fields: Standard fields
  field_timeout: Timeout (in seconds)
-  setting_thumbnails_enabled: Geef bijlage miniaturen weer
-  setting_thumbnails_size: Grootte miniaturen (in pixels)
-  label_status_transitions: Status transitie
-  label_fields_permissions: Permissie velden
-  label_readonly: Alleen-lezen
-  label_required: Verplicht
+  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_size: Thumbnails size (in pixels)
+  label_status_transitions: Status transitions
+  label_fields_permissions: Fields permissions
+  label_readonly: Read-only
+  label_required: Required
  text_repository_identifier_info: 'Alleen kleine letter (a-z), cijfers, streepjes en liggende streepjes zijn toegestaan.<br />Eenmaal opgeslagen kan de identifier niet worden gewijzigd.'
-  field_board_parent: Hoofd forum
-  label_attribute_of_project: Project %{name}
-  label_attribute_of_author: Auteur(s) %{name}
-  label_attribute_of_assigned_to: Toegewezen %{name}
-  label_attribute_of_fixed_version: Target versions %{name}
-  label_copy_subtasks: Kopieer subtaken
+  field_board_parent: Parent forum
+  label_attribute_of_project: Project's %{name}
+  label_attribute_of_author: Author's %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
+  label_copy_subtasks: Copy subtasks
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -971,64 +971,64 @@
  setting_issue_group_assignment: Tillat tildeling av saker til grupper
  label_diff: diff

-  description_query_sort_criteria_direction: Sorteringsretning
+  description_query_sort_criteria_direction: Sort direction
  description_project_scope: Search scope
  description_filter: Filter
  description_user_mail_notification: Mail notification settings
-  description_date_from: Oppgi startdato
-  description_message_content: Meldingsinnhold
-  description_available_columns: Tilgjengelige kolonner
-  description_date_range_interval: Velg datointervall ved å spesifisere start- og sluttdato
+  description_date_from: Enter start date
+  description_message_content: Message content
+  description_available_columns: Available Columns
+  description_date_range_interval: Choose range by selecting start and end date
  description_issue_category_reassign: Choose issue category
-  description_search: Søkefelt
+  description_search: Searchfield
  description_notes: Notes
  description_date_range_list: Choose range from list
-  description_choose_project: Prosjekter
-  description_date_to: Oppgi sluttdato
+  description_choose_project: Projects
+  description_date_to: Enter end date
  description_query_sort_criteria_attribute: Sort attribute
-  description_wiki_subpages_reassign: Velg ny overordnet side
-  description_selected_columns: Valgte kolonner
-  label_parent_revision: Overordnet
-  label_child_revision: Underordnet
+  description_wiki_subpages_reassign: Choose new parent page
+  description_selected_columns: Selected Columns
+  label_parent_revision: Parent
+  label_child_revision: Child
  error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
-  setting_default_issue_start_date_to_creation_date: Bruk dagens dato som startdato for nye saker
-  button_edit_section: Rediger denne seksjonen
+  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+  button_edit_section: Edit this section
  setting_repositories_encodings: Attachments and repositories encodings
-  description_all_columns: Alle kolonnene
-  button_export: Eksporter
-  label_export_options: "%{export_format} eksportvalg"
-  error_attachment_too_big: Filen overstiger maksimum filstørrelse (%{max_size}) og kan derfor ikke lastes opp
+  description_all_columns: All Columns
+  button_export: Export
+  label_export_options: "%{export_format} export options"
+  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
  label_x_issues:
    zero:  0 sak
    one:   1 sak
    other: "%{count} saker"
-  label_repository_new: Nytt depot
-  field_repository_is_default: Hoveddepot
-  label_copy_attachments: Kopier vedlegg
+  label_repository_new: New repository
+  field_repository_is_default: Main repository
+  label_copy_attachments: Copy attachments
  label_item_position: "%{position}/%{count}"
  label_completed_versions: Completed versions
-  text_project_identifier_info: Kun små bokstaver (a-z), tall, bindestrek (-) og "underscore" (_) er tillatt.<br />Etter lagring er det ikke mulig å gjøre endringer.
-  field_multiple: Flere verdier
+  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: 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: Add my notes and discard my other changes
  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
-  notice_issue_update_conflict: Saken ble oppdatert av en annen bruker mens du redigerte den.
-  text_issue_conflict_resolution_cancel: Forkast alle endringen mine og vis %{link} på nytt
+  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
  permission_manage_related_issues: Manage related issues
  field_auth_source_ldap_filter: LDAP filter
  label_search_for_watchers: Search for watchers to add
-  notice_account_deleted: Din konto er ugjenkallelig slettet.
-  setting_unsubscribe: Tillat brukere å slette sin egen konto
-  button_delete_my_account: Slett kontoen min
+  notice_account_deleted: Your account has been permanently deleted.
+  setting_unsubscribe: Allow users to delete their own account
+  button_delete_my_account: Delete my account
  text_account_destroy_confirmation: |-
-    Er du sikker på at du ønsker å fortsette?
-    Kontoen din vil bli ugjenkallelig slettet uten mulighet for å reaktiveres igjen.
-  error_session_expired: Økten har gått ut på tid. Vennligst logg på igjen.
-  text_session_expiration_settings: "Advarsel: ved å endre disse innstillingene kan aktive økter gå ut på tid, inkludert din egen."
-  setting_session_lifetime: Øktenes makslengde
-  setting_session_timeout: Økten er avsluttet på grunn av inaktivitet
-  label_session_expiration: Økten er avsluttet
+    Are you sure you want to proceed?
+    Your account will be permanently deleted, with no way to reactivate it.
+  error_session_expired: Your session has expired. Please login again.
+  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  setting_session_lifetime: Session maximum lifetime
+  setting_session_timeout: Session inactivity timeout
+  label_session_expiration: Session expiration
  permission_close_project: Close / reopen the project
  label_show_closed_projects: View closed projects
  button_close: Close
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1121,7 +1121,7 @@ ru:
  button_export: Экспорт
  label_export_options: "%{export_format} параметры экспорта"
  error_attachment_too_big: Этот файл нельзя загрузить из-за превышения максимального размера файла (%{max_size})
-  notice_failed_to_save_time_entries: "Невозможно сохранить %{count} затраченное время для %{total} выбранных: %{ids}."
+  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
  label_x_issues:
    zero:  0 Задач
    one:   1 Задача
@@ -1147,32 +1147,32 @@ ru:
  setting_unsubscribe: "Разрешить пользователям удалять свои учетные записи" 
  button_delete_my_account: "Удалить мою учетную запись" 
  text_account_destroy_confirmation: "Ваша учетная запись будет полностью удалена без возможности восстановления.\nВы уверены, что хотите продолжить?" 
-  error_session_expired: Срок вашей сессии истек. Пожалуйста войдите еще раз
+  error_session_expired: Your session has expired. Please login again.
  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
-  setting_session_lifetime: Максимальная продолжительность сессии
-  setting_session_timeout: Таймут сессии 
-  label_session_expiration: Срок истечения сессии
-  permission_close_project: Закрывать / открывать проекты
-  label_show_closed_projects: Просматривать закрытые проекты
-  button_close: Сделать закрытым
-  button_reopen: Сделать открытым
-  project_status_active: открытые
-  project_status_closed: закрытые
-  project_status_archived: архивированные
-  text_project_closed: Проект закрыт и находиться в режиме только для чтения.
-  notice_user_successful_create: Пользователь %{id} создан.
-  field_core_fields: Стандартные поля
-  field_timeout: Таймаут (в секундах)
-  setting_thumbnails_enabled: Отображать превью для приложений
-  setting_thumbnails_size: Размер первью (в пикселях)
-  label_status_transitions: Статус-переходы
-  label_fields_permissions: Права на изменения полей
-  label_readonly: Не изменяется
-  label_required: Обязательное
+  setting_session_lifetime: Session maximum lifetime
+  setting_session_timeout: Session inactivity timeout
+  label_session_expiration: Session expiration
+  permission_close_project: Close / reopen the project
+  label_show_closed_projects: View closed projects
+  button_close: Close
+  button_reopen: Reopen
+  project_status_active: active
+  project_status_closed: closed
+  project_status_archived: archived
+  text_project_closed: This project is closed and read-only.
+  notice_user_successful_create: User %{id} created.
+  field_core_fields: Standard fields
+  field_timeout: Timeout (in seconds)
+  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_size: Thumbnails size (in pixels)
+  label_status_transitions: Status transitions
+  label_fields_permissions: Fields permissions
+  label_readonly: Read-only
+  label_required: Required
  text_repository_identifier_info: Допускаются только строчные латинские буквы (a-z), цифры, тире и подчеркивания.<br />После сохранения идентификатор изменить нельзя.
-  field_board_parent: Родительский форум
-  label_attribute_of_project: Проект %{name}
-  label_attribute_of_author: Имя автора %{name}
-  label_attribute_of_assigned_to: Назначена %{name}
-  label_attribute_of_fixed_version: Версия %{name}
-  label_copy_subtasks: Копировать подзадачи
+  field_board_parent: Parent forum
+  label_attribute_of_project: Project's %{name}
+  label_attribute_of_author: Author's %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
+  label_copy_subtasks: Copy subtasks
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1061,9 +1061,9 @@ zh:
  label_readonly: 只读
  label_required: 必填
  text_repository_identifier_info: 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。<br />一旦保存，标识无法修改。
-  field_board_parent: 父论坛
-  label_attribute_of_project: 项目 %{name}
-  label_attribute_of_author: 作者 %{name}
-  label_attribute_of_assigned_to: 分配给 %{name}
-  label_attribute_of_fixed_version: 目标版本 %{name}
-  label_copy_subtasks: 复制子任务
+  field_board_parent: Parent forum
+  label_attribute_of_project: Project's %{name}
+  label_attribute_of_author: Author's %{name}
+  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_fixed_version: Target version's %{name}
+  label_copy_subtasks: Copy subtasks
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,46 +4,6 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/

-== 2012-12-18 v2.1.5
-
-* Defect #12400: Validation fails when receiving an email with list custom fields
-* Defect #12451: Macros.rb extract_macro_options should use lazy search
-* Defect #12513: Grouping of issues by custom fields not correct in PDF export
-* Defect #12566: Issue history notes previews are broken
-* Defect #12568: Clicking "edit" on a journal multiple times shows multiple forms
-* Patch #12605: Norwegian translation for 1.4-stable update
-* Patch #12614: Dutch translation
-* Patch #12615: Russian translation
-
-== 2012-11-24 v2.1.4
-
-* Defect #12274: Wiki export from Index by title is truncated
-* Defect #12298: Right-click context menu unable to batch/bulk update (IE8)
-* Defect #12332: Repository identifier does not display on Project/Settings/Repositories
-* Defect #12396: Error when receiving an email without subject header
-* Defect #12399: Non ASCII attachment filename encoding broken (MOJIBAKE) in receiving mail on Ruby 1.8
-* Defect #12409: Git: changesets aren't read after clear_changesets call
-* Defect #12431: Project.rebuild! sorts root projects by id instead of name
-
-== 2012-11-17 v2.1.3
-
-* Defect #12050: :export links to repository files lead to a 404 error
-* Defect #12189: Missing tmp/pdf directory
-* Defect #12195: Javascript error with IE7 / IE8 on new issue form
-* Defect #12196: "Page not found" on OK button in SCM "View all revisions" page
-* Defect #12199: Confirmation message displayed when clicking a disabled delete link in the context menu
-* Defect #12231: Hardcoded "Back" in Repository
-* Defect #12294: Incorrect german translation for "registered" users filter
-* Defect #12349: Watchers auto-complete search on non-latin chars
-* Defect #12358: 'None' grouped issue list section should be translated
-* Defect #12359: Version date field regex validation accepts invalid date
-* Defect #12375: Receiving mail subject encoding broken (MOJIBAKE) in some cases on Ruby 1.8
-* Patch #9732: German translations
-* Patch #12021: Russian locale translations
-* Patch #12188: Simplified Chinese translation with zh.yml file based on Rev:10681
-* Patch #12235: German translation for 2.1-stable
-* Patch #12237: Added German Translation
-
 == 2012-09-30 v2.1.2

 * Defect #11929: XSS vulnerability in Redmine 2.1.x
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -30,7 +30,7 @@ module Redmine
          attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym

          has_many :attachments, options.merge(:as => :container,
-                                               :order => "#{Attachment.table_name}.created_on ASC, #{Attachment.table_name}.id ASC",
+                                               :order => "#{Attachment.table_name}.created_on",
                                               :dependent => :destroy)
          send :include, Redmine::Acts::Attachable::InstanceMethods
          before_save :attach_saved_attachments
@@ -62,19 +62,7 @@ module Redmine

        def save_attachments(attachments, author=User.current)
          if attachments.is_a?(Hash)
-            attachments = attachments.stringify_keys
-            attachments = attachments.to_a.sort {|a, b|
-              if a.first.to_i > 0 && b.first.to_i > 0
-                a.first.to_i <=> b.first.to_i
-              elsif a.first.to_i > 0
-                1
-              elsif b.first.to_i > 0
-                -1
-              else
-                a.first <=> b.first
-              end
-            }
-            attachments = attachments.map(&:last)
+            attachments = attachments.values
          end
          if attachments.is_a?(Array)
            attachments.each do |attachment|
--- a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
+++ b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
@@ -186,7 +186,7 @@ module CollectiveIdea #:nodoc:
            end

            # Find root node(s)
-            root_nodes = where("#{quoted_parent_column_name} IS NULL").order(acts_as_nested_set_options[:order]).each do |root_node|
+            root_nodes = where("#{quoted_parent_column_name} IS NULL").order("#{quoted_left_column_name}, #{quoted_right_column_name}, id").each do |root_node|
              # setup index for this scope
              indices[scope.call(root_node)] ||= 0
              set_left_and_rights.call(root_node)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -422,7 +422,7 @@ module Redmine
          if query.grouped? &&
               (group = query.group_by_column.value(issue)) != previous_group
            pdf.SetFontStyle('B',10)
-            group_label = group.blank? ? 'None' : group.to_s.dup
+            group_label = group.blank? ? 'None' : group.to_s
            group_label << " (#{query.issue_count_by_group[group]})"
            pdf.Bookmark group_label, 0, -1
            pdf.RDMCell(table_width + col_id_width, row_height * 2, group_label, 1, 1, 'L')
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
  module VERSION #:nodoc:
    MAJOR = 2
    MINOR = 1
-    TINY  = 5
+    TINY  = 2

    # Branch values:
    # * official release: nil
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -48,7 +48,7 @@ module Redmine

        def extract_macro_options(args, *keys)
          options = {}
-          while args.last.to_s.strip =~ %r{^(.+?)\=(.+)$} && keys.include?($1.downcase.to_sym)
+          while args.last.to_s.strip =~ %r{^(.+)\=(.+)$} && keys.include?($1.downcase.to_sym)
            options[$1.downcase.to_sym] = $2
            args.pop
          end
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -464,11 +464,9 @@ function updateBulkEditFrom(url) {
 }

 function observeAutocompleteField(fieldId, url) {
-  $(document).ready(function() {
-    $('#'+fieldId).autocomplete({
-      source: url,
-      minLength: 2
-    });
+  $('#'+fieldId).autocomplete({
+    source: url,
+    minLength: 2,
  });
 }

--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -25,7 +25,7 @@ function contextMenuClick(event) {
  }
  contextMenuHide();
  if (target.is('a') || target.is('img')) { return; }
-  if (event.which == 1 || (navigator.appVersion.match(/\bMSIE\b/))) {
+  if (event.which == 1 /*TODO || (navigator.appVersion.match(/\bMSIE\b/))*/) {
    var tr = target.parents('tr').first();
    if (tr.length && tr.hasClass('hascontextmenu')) {
      // a row was clicked, check if the click was on checkbox
--- a/test/fixtures/mail_handler/gmail_with_attachment_iso-8859-1.eml
+++ b/test/fixtures/mail_handler/gmail_with_attachment_iso-8859-1.eml
@@ -1,26 +0,0 @@
-Date: Tue, 20 Nov 2012 23:08:25 +0900
-Message-ID: <CANBr5-UZM=Odz4U3Q6vHd_9cd2tCT-_P9xDd=hRJ0aoMNTWXbw@mail.gmail.com>
-Subject: test
-From: John Smith <JSmith@somenet.foo>
-To: redmine@somenet.foo
-Content-Type: multipart/mixed; boundary=14dae93a13bf76ca5d04ceedc458
-
--14dae93a13bf76ca5d04ceedc458
-Content-Type: text/plain; charset=ISO-8859-1
-
-test
-
--14dae93a13bf76ca5d04ceedc458
-Content-Type: text/plain; charset=US-ASCII; 
-	name="=?ISO-8859-1?B?xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tw=?=
-	=?ISO-8859-1?B?/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc?=
-	=?ISO-8859-1?B?/MTk1vbc/C50eHQ=?="
-Content-Disposition: attachment; 
-	filename="=?ISO-8859-1?B?xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tw=?=
-	=?ISO-8859-1?B?/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc?=
-	=?ISO-8859-1?B?/MTk1vbc/C50eHQ=?="
-Content-Transfer-Encoding: base64
-X-Attachment-Id: f_h9r3mcjz0
-
-dGVzdAo=
--14dae93a13bf76ca5d04ceedc458--
--- a/test/fixtures/mail_handler/gmail_with_attachment_ja.eml
+++ b/test/fixtures/mail_handler/gmail_with_attachment_ja.eml
@@ -1,20 +0,0 @@
-Date: Mon, 19 Nov 2012 10:17:45 +0900
-Message-ID: <CANBr5-U6cXMfLek5QiB2ZrBPR3vTThn9_Upvdkf3Dkod664+Xw@mail.gmail.com>
-Subject: test
-From: John Smith <JSmith@somenet.foo>
-To: redmine@somenet.foo
-Content-Type: multipart/mixed; boundary=bcaec54ee4ea84f77904cecee22e
-
--bcaec54ee4ea84f77904cecee22e
-Content-Type: text/plain; charset=ISO-8859-1
-
-test
-
--bcaec54ee4ea84f77904cecee22e
-Content-Type: text/plain; charset=US-ASCII; name="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?="
-Content-Disposition: attachment; filename="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?="
-Content-Transfer-Encoding: base64
-X-Attachment-Id: f_h9owndpv0
-
-dGVzdAo=
--bcaec54ee4ea84f77904cecee22e--
--- a/test/fixtures/mail_handler/no_subject_header.eml
+++ b/test/fixtures/mail_handler/no_subject_header.eml
@@ -1,10 +0,0 @@
-Content-Type: application/ms-tnef; name="winmail.dat"
-Content-Transfer-Encoding: binary
-From: John Smith <JSmith@somenet.foo>
-To: "redmine@somenet.foo" <redmine@somenet.foo>
-Date: Fri, 1 Jun 2012 14:39:38 +0200
-Message-ID: <87C31D42249DD0489D1A1444E3232DD7019D6183@foo.bar>
-Accept-Language: de-CH, en-US
-Content-Language: de-CH
-
-Fixture
--- a/test/fixtures/mail_handler/subject_japanese_1.eml
+++ b/test/fixtures/mail_handler/subject_japanese_1.eml
@@ -1,7 +0,0 @@
-From: John Smith <JSmith@somenet.foo>
-To: "redmine@somenet.foo" <redmine@somenet.foo>
-Subject: =?iso-2022-jp?b?GyRCJUYlOSVIGyhCCg=?=
-Date: Fri, 1 Jun 2012 14:39:38 +0200
-Message-ID: <87C31D42249DD0489D1A1444E3232DD7019D6183@foo.bar>
-
-Fixture
--- a/test/fixtures/mail_handler/subject_japanese_2.eml
+++ b/test/fixtures/mail_handler/subject_japanese_2.eml
@@ -1,7 +0,0 @@
-From: John Smith <JSmith@somenet.foo>
-To: "redmine@somenet.foo" <redmine@somenet.foo>
-Subject: Re: =?iso-2022-jp?b?GyRCJUYlOSVIGyhCCg=?=
-Date: Fri, 1 Jun 2012 14:39:38 +0200
-Message-ID: <87C31D42249DD0489D1A1444E3232DD7019D6183@foo.bar>
-
-Fixture
--- a/test/fixtures/mail_handler/thunderbird_with_attachment_iso-8859-1.eml
+++ b/test/fixtures/mail_handler/thunderbird_with_attachment_iso-8859-1.eml
@@ -1,34 +0,0 @@
-Message-ID: <50AB9546.7020800@gmail.com>
-Date: Tue, 20 Nov 2012 23:35:50 +0900
-From: John Smith <JSmith@somenet.foo>
-User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc13 Thunderbird/3.1.10
-MIME-Version: 1.0
-To: redmine@somenet.foo
-Subject: test
-Content-Type: multipart/mixed;
- boundary="------------050902080306030406090208"
-
-This is a multi-part message in MIME format.
--------------050902080306030406090208
-Content-Type: text/plain; charset=ISO-8859-1; format=flowed
-Content-Transfer-Encoding: 7bit
-
-test
-
--------------050902080306030406090208
-Content-Type: image/png;
- name="=?ISO-8859-1?Q?=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4?=
- =?ISO-8859-1?Q?=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6?=
- =?ISO-8859-1?Q?=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6?=
- =?ISO-8859-1?Q?=DC=FC=C4=E4=D6=F6=DC=FC=2Epng?="
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename*0*=ISO-8859-1''%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6;
- filename*1*=%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC;
- filename*2*=%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4;
- filename*3*=%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%2E%70%6E%67
-
-iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAAAXNSR0IArs4c6QAAAAlwSFlz
-AAALEwAACxMBAJqcGAAAAAd0SU1FB9wLFA4fJhRKIUQAAAAUSURBVAjXY/z//z8DEmBiQAWk
-8gHq9gMHP8uZWAAAAABJRU5ErkJggg==
--------------050902080306030406090208--
--- a/test/fixtures/mail_handler/thunderbird_with_attachment_ja.eml
+++ b/test/fixtures/mail_handler/thunderbird_with_attachment_ja.eml
@@ -1,26 +0,0 @@
-Message-ID: <50AA00C6.4070108@gmail.com>
-Date: Mon, 19 Nov 2012 18:49:58 +0900
-From: John Smith <JSmith@somenet.foo>
-User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Fedora/3.0.10-1.fc12 Lightning/1.0b1 Thunderbird/3.0.10
-MIME-Version: 1.0
-To: redmine@somenet.foo
-Subject: test
-Content-Type: multipart/mixed;
- boundary="------------030104060902010800050907"
-
-This is a multi-part message in MIME format.
--------------030104060902010800050907
-Content-Type: text/plain; charset=ISO-2022-JP
-Content-Transfer-Encoding: 7bit
-
-test
-
--------------030104060902010800050907
-Content-Type: text/plain;
- name="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?="
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename*=ISO-2022-JP''%1B%24%42%25%46%25%39%25%48%1B%28%42%2E%74%78%74
-
-dGVzdAo=
--------------030104060902010800050907--
--- a/test/fixtures/mail_handler/ticket_with_custom_fields.eml
+++ b/test/fixtures/mail_handler/ticket_with_custom_fields.eml
@@ -39,4 +39,3 @@ pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.

 category: Stock management
 searchable field: Value for a custom field
-Database:  postgresql
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -532,21 +532,6 @@ class RepositoriesGitControllerTest < ActionController::TestCase
      end
    end

-    def test_revisions
-      assert_equal 0, @repository.changesets.count
-      @repository.fetch_changesets
-      @project.reload
-      assert_equal NUM_REV, @repository.changesets.count
-      get :revisions, :id => PRJ_ID
-      assert_response :success
-      assert_template 'revisions'
-      assert_tag :tag => 'form',
-                 :attributes => {
-                   :method => 'get',
-                   :action => '/projects/subproject1/repository/revision'
-                 }
-    end
-
    def test_revision
      assert_equal 0, @repository.changesets.count
      @repository.fetch_changesets
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -25,7 +25,6 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
    :member_roles,
    :issues,
    :issue_statuses,
-    :issue_relations,
    :versions,
    :trackers,
    :projects_trackers,
--- a/test/object_helpers.rb
+++ b/test/object_helpers.rb
@@ -61,8 +61,6 @@ module ObjectHelpers

  def Issue.generate!(attributes={})
    issue = Issue.new(attributes)
-    issue.project ||= Project.find(1)
-    issue.tracker ||= issue.project.trackers.first
    issue.subject = 'Generated' if issue.subject.blank?
    issue.author ||= User.find(2)
    yield issue if block_given?
--- a/test/unit/custom_field_test.rb
+++ b/test/unit/custom_field_test.rb
@@ -212,9 +212,4 @@ class CustomFieldTest < ActiveSupport::TestCase
    assert_nil CustomField.new(:field_format => 'text').value_class
    assert_nil CustomField.new.value_class
  end
-
-  def test_value_from_keyword_for_list_custom_field
-    field = CustomField.find(1)
-    assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1))
-  end
 end
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -253,15 +253,8 @@ RAW

    project_url = {:controller => 'projects', :action => 'show', :id => 'subproject1'}

-    source_url = '/projects/ecookbook/repository/entry/some/file'
-    source_url_with_rev = '/projects/ecookbook/repository/revisions/52/entry/some/file'
-    source_url_with_ext = '/projects/ecookbook/repository/entry/some/file.ext'
-    source_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/entry/some/file.ext'
-
-    export_url = '/projects/ecookbook/repository/raw/some/file'
-    export_url_with_rev = '/projects/ecookbook/repository/revisions/52/raw/some/file'
-    export_url_with_ext = '/projects/ecookbook/repository/raw/some/file.ext'
-    export_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/raw/some/file.ext'
+    source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
+    source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}

    to_test = {
      # tickets
@@ -291,16 +284,12 @@ RAW
      'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
      'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
      'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
-      'source:/some/file@52'        => link_to('source:/some/file@52', source_url_with_rev, :class => 'source'),
-      'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_rev_and_ext, :class => 'source'),
-      'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url + "#L110", :class => 'source'),
-      'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext + "#L110", :class => 'source'),
-      'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url_with_rev + "#L110", :class => 'source'),
-      # export
-      'export:/some/file'           => link_to('export:/some/file', export_url, :class => 'source download'),
-      'export:/some/file.ext'       => link_to('export:/some/file.ext', export_url_with_ext, :class => 'source download'),
-      'export:/some/file@52'        => link_to('export:/some/file@52', export_url_with_rev, :class => 'source download'),
-      'export:/some/file.ext@52'    => link_to('export:/some/file.ext@52', export_url_with_rev_and_ext, :class => 'source download'),
+      'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
+      'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_ext.merge(:rev => 52), :class => 'source'),
+      'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
+      'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
+      'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
+      'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
      # forum
      'forum#2'                     => link_to('Discussion', board_url, :class => 'board'),
      'forum:Discussion'            => link_to('Discussion', board_url, :class => 'board'),
--- a/test/unit/helpers/issues_helper_test.rb
+++ b/test/unit/helpers/issues_helper_test.rb
@@ -109,55 +109,51 @@ class IssuesHelperTest < ActionView::TestCase
      end
    end

-    context "with a start_date attribute" do
-      should "format the current date" do
-        @detail = JournalDetail.new(
+    def test_with_a_start_date_attribute_should_format_the_current_date
+      @detail = JournalDetail.new(
                   :property  => 'attr',
                   :old_value => '2010-01-01',
                   :value     => '2010-01-31',
                   :prop_key  => 'start_date'
                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/31/2010", show_detail(@detail, true)
-        end
-      end
-
-      should "format the old date" do
-        @detail = JournalDetail.new(
-                   :property  => 'attr',
-                   :old_value => '2010-01-01',
-                   :value     => '2010-01-31',
-                   :prop_key  => 'start_date'
-                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/01/2010", show_detail(@detail, true)
-        end
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/31/2010", show_detail(@detail, true)
      end
    end

-    context "with a due_date attribute" do
-      should "format the current date" do
-        @detail = JournalDetail.new(
-                  :property  => 'attr',
-                  :old_value => '2010-01-01',
-                  :value     => '2010-01-31',
-                  :prop_key  => 'due_date'
+    def test_with_a_start_date_attribute_should_format_the_old_date
+      @detail = JournalDetail.new(
+                   :property  => 'attr',
+                   :old_value => '2010-01-01',
+                   :value     => '2010-01-31',
+                   :prop_key  => 'start_date'
                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/31/2010", show_detail(@detail, true)
-        end
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/01/2010", show_detail(@detail, true)
      end
+    end

-      should "format the old date" do
-        @detail = JournalDetail.new(
+    def test_with_a_due_date_attribute_should_with_a_due_date_attribute
+      @detail = JournalDetail.new(
                  :property  => 'attr',
                  :old_value => '2010-01-01',
                  :value     => '2010-01-31',
                  :prop_key  => 'due_date'
                )
-        with_settings :date_format => '%m/%d/%Y' do
-          assert_match "01/01/2010", show_detail(@detail, true)
-        end
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/31/2010", show_detail(@detail, true)
+      end
+    end
+
+    def test_with_a_due_date_attribute_should_format_the_old_date
+      @detail = JournalDetail.new(
+                  :property  => 'attr',
+                  :old_value => '2010-01-01',
+                  :value     => '2010-01-31',
+                  :prop_key  => 'due_date'
+                )
+      with_settings :date_format => '%m/%d/%Y' do
+        assert_match "01/01/2010", show_detail(@detail, true)
      end
    end

--- a/test/unit/issue_relation_test.rb
+++ b/test/unit/issue_relation_test.rb
@@ -18,17 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)

 class IssueRelationTest < ActiveSupport::TestCase
-  fixtures :projects,
-           :users,
-           :roles,
-           :members,
-           :member_roles,
-           :issues,
-           :issue_statuses,
-           :issue_relations,
-           :enabled_modules,
-           :enumerations,
-           :trackers
+  fixtures :issue_relations, :issues

  def test_create
    from = Issue.find(1)
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -1576,18 +1576,4 @@ class IssueTest < ActiveSupport::TestCase
  def test_journals_after_with_blank_arg_should_return_all_journals
    assert_equal [Journal.find(1), Journal.find(2)], Issue.find(1).journals_after('')
  end
-
-  def test_save_attachments_with_hash_should_save_attachments_in_keys_order
-    set_tmp_attachments_directory
-    issue = Issue.generate!
-    issue.save_attachments({
-      'p0' => {'file' => mock_file_with_options(:original_filename => 'upload')},
-      '3' => {'file' => mock_file_with_options(:original_filename => 'bar')},
-      '1' => {'file' => mock_file_with_options(:original_filename => 'foo')}
-    })
-    issue.attach_saved_attachments
-
-    assert_equal 3, issue.reload.attachments.count
-    assert_equal %w(upload foo bar), issue.attachments.map(&:filename)
-  end
 end
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -100,25 +100,6 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
    assert_equal '<p>Hello world! Object: Issue, Called with no argument and no block of text.</p>', textilizable(text, :object => Issue.find(1))
  end

-  def test_extract_macro_options_should_with_args
-    options = extract_macro_options(["arg1", "arg2"], :foo, :size)
-    assert_equal([["arg1", "arg2"], {}], options)
-  end
-
-  def test_extract_macro_options_should_with_options
-    options = extract_macro_options(["foo=bar", "size=2"], :foo, :size)
-    assert_equal([[], {:foo => "bar", :size => "2"}], options)
-  end
-
-  def test_extract_macro_options_should_with_args_and_options
-    options = extract_macro_options(["arg1", "arg2", "foo=bar", "size=2"], :foo, :size)
-    assert_equal([["arg1", "arg2"], {:foo => "bar", :size => "2"}], options)
-  end
-
-  def test_extract_macro_options_should_parse_options_lazily
-    options = extract_macro_options(["params=x=1&y=2"], :params)
-    assert_equal([[], {:params => "x=1&y=2"}], options)
-  end

  def test_macro_exception_should_be_displayed
    Redmine::WikiFormatting::Macros.macro :exception do |obj, args|
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -177,8 +177,8 @@ class MailHandlerTest < ActiveSupport::TestCase
    assert !issue.new_record?
    issue.reload
    assert_equal 'New ticket with custom field values', issue.subject
-    assert_equal 'PostgreSQL', issue.custom_field_value(1)
-    assert_equal 'Value for a custom field', issue.custom_field_value(2)
+    assert_equal 'Value for a custom field',
+                 issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
    assert !issue.description.match(/^searchable field:/i)
  end

@@ -373,80 +373,6 @@ class MailHandlerTest < ActiveSupport::TestCase
    assert_equal 'caaf384198bcbc9563ab5c058acd73cd', attachment.digest
  end

-  def test_thunderbird_with_attachment_ja
-    issue = submit_email(
-              'thunderbird_with_attachment_ja.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    assert_equal 1, issue.attachments.size
-    ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88.txt"
-    ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
-    attachment = issue.attachments.first
-    assert_equal ja, attachment.filename
-    assert_equal 5, attachment.filesize
-    assert File.exist?(attachment.diskfile)
-    assert_equal 5, File.size(attachment.diskfile)
-    assert_equal 'd8e8fca2dc0f896fd7cb4cb0031ba249', attachment.digest
-  end
-
-  def test_gmail_with_attachment_ja
-    issue = submit_email(
-              'gmail_with_attachment_ja.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    assert_equal 1, issue.attachments.size
-    ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88.txt"
-    ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
-    attachment = issue.attachments.first
-    assert_equal ja, attachment.filename
-    assert_equal 5, attachment.filesize
-    assert File.exist?(attachment.diskfile)
-    assert_equal 5, File.size(attachment.diskfile)
-    assert_equal 'd8e8fca2dc0f896fd7cb4cb0031ba249', attachment.digest
-  end
-
-  def test_thunderbird_with_attachment_latin1
-    issue = submit_email(
-              'thunderbird_with_attachment_iso-8859-1.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    assert_equal 1, issue.attachments.size
-    u = ""
-    u.force_encoding('UTF-8') if u.respond_to?(:force_encoding)
-    u1 = "\xc3\x84\xc3\xa4\xc3\x96\xc3\xb6\xc3\x9c\xc3\xbc"
-    u1.force_encoding('UTF-8') if u1.respond_to?(:force_encoding)
-    11.times { u << u1 }
-    attachment = issue.attachments.first
-    assert_equal "#{u}.png", attachment.filename
-    assert_equal 130, attachment.filesize
-    assert File.exist?(attachment.diskfile)
-    assert_equal 130, File.size(attachment.diskfile)
-    assert_equal '4d80e667ac37dddfe05502530f152abb', attachment.digest
-  end
-
-  def test_gmail_with_attachment_latin1
-    issue = submit_email(
-              'gmail_with_attachment_iso-8859-1.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    assert_equal 1, issue.attachments.size
-    u = ""
-    u.force_encoding('UTF-8') if u.respond_to?(:force_encoding)
-    u1 = "\xc3\x84\xc3\xa4\xc3\x96\xc3\xb6\xc3\x9c\xc3\xbc"
-    u1.force_encoding('UTF-8') if u1.respond_to?(:force_encoding)
-    11.times { u << u1 }
-    attachment = issue.attachments.first
-    assert_equal "#{u}.txt", attachment.filename
-    assert_equal 5, attachment.filesize
-    assert File.exist?(attachment.diskfile)
-    assert_equal 5, File.size(attachment.diskfile)
-    assert_equal 'd8e8fca2dc0f896fd7cb4cb0031ba249', attachment.digest
-  end
-
  def test_add_issue_with_iso_8859_1_subject
    issue = submit_email(
              'subject_as_iso-8859-1.eml',
@@ -456,37 +382,6 @@ class MailHandlerTest < ActiveSupport::TestCase
    assert_equal 'Testmail from Webmail: ä ö ü...', issue.subject
  end

-  def test_add_issue_with_japanese_subject
-    issue = submit_email(
-              'subject_japanese_1.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    ja = "\xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
-    ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
-    assert_equal ja, issue.subject
-  end
-
-  def test_add_issue_with_no_subject_header
-    issue = submit_email(
-              'no_subject_header.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    assert_equal '(no subject)', issue.subject
-  end
-
-  def test_add_issue_with_mixed_japanese_subject
-    issue = submit_email(
-              'subject_japanese_2.eml',
-              :issue => {:project => 'ecookbook'}
-            )
-    assert_kind_of Issue, issue
-    ja = "Re: \xe3\x83\x86\xe3\x82\xb9\xe3\x83\x88"
-    ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
-    assert_equal ja, issue.subject
-  end
-
  def test_should_ignore_emails_from_locked_users
    User.find(2).lock!

--- a/test/unit/principal_test.rb
+++ b/test/unit/principal_test.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Redmine - project management software
 # Copyright (C) 2006-2012  Jean-Philippe Lang
 #
@@ -108,11 +106,4 @@ class PrincipalTest < ActiveSupport::TestCase
      assert_equal @palmer, results.first
    end
  end
-
-  def test_like_scope_with_cyrillic_name
-    user = User.generate!(:firstname => 'Соболев', :lastname => 'Денис')
-    results = Principal.like('Собо')
-    assert_equal 1, results.count
-    assert_equal user, results.first
-  end
 end
--- a/test/unit/project_nested_set_test.rb
+++ b/test/unit/project_nested_set_test.rb
@@ -28,17 +28,17 @@ class ProjectNestedSetTest < ActiveSupport::TestCase
    @a2 = Project.create!(:name => 'A2', :identifier => 'projecta2')
    @a2.set_parent!(@a)

-    @c = Project.create!(:name => 'C', :identifier => 'projectc')
-    @c1 = Project.create!(:name => 'C1', :identifier => 'projectc1')
-    @c1.set_parent!(@c)
-
    @b = Project.create!(:name => 'B', :identifier => 'projectb')
-    @b2 = Project.create!(:name => 'B2', :identifier => 'projectb2')
-    @b2.set_parent!(@b)
    @b1 = Project.create!(:name => 'B1', :identifier => 'projectb1')
    @b1.set_parent!(@b)
    @b11 = Project.create!(:name => 'B11', :identifier => 'projectb11')
    @b11.set_parent!(@b1)
+    @b2 = Project.create!(:name => 'B2', :identifier => 'projectb2')
+    @b2.set_parent!(@b)
+
+    @c = Project.create!(:name => 'C', :identifier => 'projectc')
+    @c1 = Project.create!(:name => 'C1', :identifier => 'projectc1')
+    @c1.set_parent!(@c)

    @a, @a1, @a2, @b, @b1, @b11, @b2, @c, @c1 = *(Project.all.sort_by(&:name))
  end
@@ -47,13 +47,6 @@ class ProjectNestedSetTest < ActiveSupport::TestCase
    assert_valid_nested_set
  end

-  def test_rebuild_should_build_valid_tree
-    Project.update_all "lft = NULL, rgt = NULL"
-
-    Project.rebuild!
-    assert_valid_nested_set
-  end
-
  def test_moving_a_child_to_a_different_parent_should_keep_valid_tree
    assert_no_difference 'Project.count' do
      Project.find_by_name('B1').set_parent!(Project.find_by_name('A2'))
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -217,40 +217,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
      assert_equal h1, h2
    end

-    def test_keep_extra_report_last_commit_in_clear_changesets
-      assert_nil @repository.extra_info
-      h = {}
-      h["extra_report_last_commit"] = "1"
-      @repository.merge_extra_info(h)
-      @repository.save
-      @project.reload
-
-      assert_equal 0, @repository.changesets.count
-      @repository.fetch_changesets
-      @project.reload
-
-      assert_equal NUM_REV, @repository.changesets.count
-      @repository.send(:clear_changesets)
-      assert_equal 1, @repository.extra_info.size
-      assert_equal "1", @repository.extra_info["extra_report_last_commit"]
-    end
-
-    def test_refetch_after_clear_changesets
-      assert_nil @repository.extra_info
-      assert_equal 0, @repository.changesets.count
-      @repository.fetch_changesets
-      @project.reload
-      assert_equal NUM_REV, @repository.changesets.count
-
-      @repository.send(:clear_changesets)
-      @project.reload
-      assert_equal 0, @repository.changesets.count
-
-      @repository.fetch_changesets
-      @project.reload
-      assert_equal NUM_REV, @repository.changesets.count
-    end
-
    def test_parents
      assert_equal 0, @repository.changesets.count
      @repository.fetch_changesets
--- a/test/unit/version_test.rb
+++ b/test/unit/version_test.rb
@@ -32,13 +32,7 @@ class VersionTest < ActiveSupport::TestCase

  def test_invalid_effective_date_validation
    v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01')
-    assert !v.valid?
-    v.effective_date = '2012-11-33'
-    assert !v.valid?
-    v.effective_date = '2012-31-11'
-    assert !v.valid?
-    v.effective_date = 'ABC'
-    assert !v.valid?
+    assert !v.save
    assert_include I18n.translate('activerecord.errors.messages.not_a_date'),
                   v.errors[:effective_date]
  end
--- a/tmp/pdf/empty
+++ b/tmp/pdf/empty