Merge tag 'v3.8.0' into backbone.ws

.travis.yml

@@ -22,13 +22,10 @@ matrix:
 before_install:
   - "sudo apt-get update -qq"
   - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
-
-  # Our tests don't work on Darcs >= 2.5, so we use Darcs 2.3 from Ubuntu Lucy
-  - "sudo apt-get --no-install-recommends install libc6 libcurl3-gnutls libgmp3c2 libncurses5 zlib1g"
-  - "wget http://de.archive.ubuntu.com/ubuntu/pool/main/libf/libffi/libffi5_3.0.9-1_i386.deb -O /tmp/libffi5_3.0.9-1_i386.deb; sudo dpkg -i /tmp/libffi5_3.0.9-1_i386.deb"
-  - "wget http://de.archive.ubuntu.com/ubuntu/pool/universe/d/darcs/darcs_2.3.0-3_i386.deb -O /tmp/darcs_2.3.0-3_i386.deb; sudo dpkg -i /tmp/darcs_2.3.0-3_i386.deb"
 before_script:
+  - "rvm rubygems 1.8.25" # Rubygems 2.0.x fails with Rails 2.3
   - "rake ci:travis:prepare"
+  - "rm -rf tmp/test/darcs_repository" # Don't test Darcs on Travis. It breaks there :(
 branches:
   only:
     - unstable

Gemfile

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-source :rubygems
+source "https://rubygems.org"
 
-gem "rails", "2.3.17"
+gem "rails", "2.3.18"
 
 gem "json", "~> 1.7.7"
 gem "coderay", "~> 1.0.0"

app/controllers/application_controller.rb

@@ -54,7 +54,14 @@ class ApplicationController < ActionController::Base
 
   # FIXME: This doesn't work with Rails >= 3.0 anymore
   # Possible workaround: https://github.com/rails/rails/issues/671#issuecomment-1780159
-  rescue_from ActionController::RoutingError, :with => proc{render_404}
+  rescue_from ActionController::RoutingError, :with => proc{
+    # manually apply basic before_filters which aren't applied by default here
+    user_setup
+    check_if_login_required
+    set_localization
+
+    render_404
+  }
 
   include Redmine::Search::Controller
   include Redmine::MenuManager::MenuController

app/views/groups/index.html.erb

@@ -19,6 +19,7 @@
     <td class="buttons"><%= link_to l(:button_delete), group, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %></td>
   </tr>
 <% end %>
+  </tbody>
 </table>
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>

app/views/issues/_attributes.rhtml

@@ -31,8 +31,8 @@
 </div>
 
 <div class="splitcontentright">
-<p><%= f.date_field :start_date, :size => 10, :disabled => !@issue.leaf? %></p>
-<p><%= f.date_field :due_date, :size => 10, :disabled => !@issue.leaf? %></p>
+<p><%= f.date_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
+<p><%= f.date_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
 <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p>
 <% if @issue.leaf? && Issue.use_field_for_done_ratio? %>
 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>

db/migrate/20100714111652_update_journals_for_acts_as_journalized.rb

@@ -50,7 +50,6 @@ class UpdateJournalsForActsAsJournalized < ActiveRecord::Migration
       t.string :journalized_type, :limit => 30, :default => "", :null => false
     end
 
-    custom_field_names = CustomField.all.group_by(&:type)[IssueCustomField].collect(&:name)
     Journal.all.each do |j|
       # Can't used j.journalized.class.name because the model changes make it nil
       j.update_attribute(:journalized_type, j.type.to_s.sub("Journal","")) if j.type.present?

doc/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = ChiliProject Changelog
 
+== 2013-03-19 v3.8.0
+
+* Bug #1121: Date Picker Icons disappear when changing the Tracker
+* Bug #1164: Error in "rake db:migrate:down VERSION=20100714111652"
+* Bug #1248: Routing issue
+* Security - Bug #1252: Update Rails to 2.3.18
+
 == 2013-02-13 v3.7.0
 
 * Security - Feature #1233: Bump rails to 2.3.17 to address [CVE-2013-0276]

lib/chili_project/version.rb

@@ -18,7 +18,7 @@ module ChiliProject
   module VERSION #:nodoc:
 
     MAJOR = 3
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
     TINY  = PATCH # Redmine compat