Download as
Browse Code »

Commit ce1288aa6e4a42ebbc00a22dac96548ffc7525af

Authored by Leandro Santos
2 parents 72cfd581 6005549e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branches 'rails3' and 'AI3268_template_management' into AI3268_template_management

Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @ce1288a
... ... @@ -61,7 +61,7 @@ GEM
61 61 database_cleaner (1.2.0)
62 62 diff-lcs (1.1.3)
63 63 erubis (2.7.0)
64   - eventmachine (0.12.11)
  64 + eventmachine (0.12.10)
65 65 fast_gettext (0.6.8)
66 66 ffi (1.0.11)
67 67 gherkin (2.4.21)
... ...
db/migrate/20140808185510_update_default_tagging_context.rb 0 → 100644
  Diff comments   View file @ce1288a
... ... @@ -0,0 +1,11 @@
  1 +class UpdateDefaultTaggingContext < ActiveRecord::Migration
  2 +
  3 + def self.up
  4 + ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => nil).update_all(:context => 'tags')
  5 + end
  6 +
  7 + def self.down
  8 + ActsAsTaggableOn::Tagging.where(:taggable_type => Article, :context => 'tags').update_all(:context => nil)
  9 + end
  10 +
  11 +end
... ...