Download as
Browse Code »

Commit 49192e7a8cd213f561528fc61fe7a71890ea944f

Authored by Weblate
2 parents f837d452 59e12838
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 remote-tracking branch 'origin/master'

Showing 3 changed files with 3 additions and 1 deletions   Show diff stats
1 source "https://rubygems.org" 1 source "https://rubygems.org"
2 gem 'rails', '~> 3.2.19' 2 gem 'rails', '~> 3.2.19'
  3 +gem 'minitest', '~> 3.2.0'
3 gem 'fast_gettext', '~> 0.6.8' 4 gem 'fast_gettext', '~> 0.6.8'
4 gem 'acts-as-taggable-on', '~> 3.0.2' 5 gem 'acts-as-taggable-on', '~> 3.0.2'
5 gem 'prototype-rails', '~> 3.2.1' 6 gem 'prototype-rails', '~> 3.2.1'
debian/control
  Diff comments   View file @49192e7
@@ -66,6 +66,7 @@ Depends: @@ -66,6 +66,7 @@ Depends:
66 ruby-eventmachine (>= 0.12.10-4~), 66 ruby-eventmachine (>= 0.12.10-4~),
67 ruby-rack (>= 1.4.5-2~), 67 ruby-rack (>= 1.4.5-2~),
68 ruby-tzinfo (>= 1.1.0-2~), 68 ruby-tzinfo (>= 1.1.0-2~),
  69 + ruby-minitest,
69 ${misc:Depends} 70 ${misc:Depends}
70 Recommends: 71 Recommends:
71 postgresql, 72 postgresql,
script/install-dependencies/debian-wheezy.sh
  Diff comments   View file @49192e7
@@ -63,7 +63,7 @@ run sudo apt-get -qy dist-upgrade @@ -63,7 +63,7 @@ run sudo apt-get -qy dist-upgrade
63 run sudo apt-get -y install dctrl-tools 63 run sudo apt-get -y install dctrl-tools
64 64
65 # needed to run noosfero 65 # needed to run noosfero
66 -packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e 's/([^)]*)//g; s/,\s*/\n/g' | grep -v 'memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent') 66 +packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e '/^\s*#/d; s/([^)]*)//g; s/,\s*/\n/g' | grep -v 'memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent')
67 run sudo apt-get -y install $packages 67 run sudo apt-get -y install $packages
68 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox 68 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
69 69