Merge pull request #45 from finnlabs/feature/rails4

[20040] Upgrade to Rails 4.0.x
9 years ago · 009792c140
parent 8feb42ff5d bdb090f89d
commit 009792c140
3 changed files with 1 additions and 4 deletions
--- a/app/controllers/my_projects_overviews_controller.rb
+++ b/app/controllers/my_projects_overviews_controller.rb
@ -23,8 +23,6 @@ class MyProjectsOverviewsController < ApplicationController

  menu_item :overview

-  unloadable
-
  before_filter :find_project, :find_user
  before_filter :authorize
  before_filter :jump_to_project_menu_item, :only => :index
--- a/app/models/my_projects_overview.rb
+++ b/app/models/my_projects_overview.rb
@ -20,7 +20,6 @@
 #++

 class MyProjectsOverview < ActiveRecord::Base
-  unloadable

  after_initialize :initialize_default_values

--- a/openproject-my_project_page.gemspec
+++ b/openproject-my_project_page.gemspec
@ -20,7 +20,7 @@ Gem::Specification.new do |s|
  s.files = Dir["{app,config,db,lib}/**/*", "README.md"]
  s.test_files = Dir["spec/**/*"]

-  s.add_dependency "rails", "~> 3.2.9"
+  s.add_dependency 'rails', '~> 4.0.13'
  

  s.add_development_dependency "factory_girl_rails", "~> 4.0"