Download as
Browse Code »

Commit bff221c15e8818303aac13231c88f607afce72e0

Authored by Victor Costa
2 parents 60262a33 b60d857b
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'master' into stable 

Conflicts:
	debian/control
Showing 5 changed files with 76 additions and 127 deletions   Show diff stats
Gemfile
  Diff comments   View file @bff221c
1 1 source "https://rubygems.org"
2   -gem 'rails', '~> 3.2.19'
  2 +gem 'rails', '~> 3.2.21'
3 3 gem 'minitest', '~> 3.2.0'
4 4 gem 'fast_gettext', '~> 0.6.8'
5 5 gem 'acts-as-taggable-on', '~> 3.0.2'
... ...
MIGRATION_ISSUES
View file @60262a3
... ... @@ -1,41 +0,0 @@
1   -* ruby-get-text incmopatible with rails3. Maybe we can use it's gem
2   -
3   -* all js code is inside miscellaneous.js. Would be nice to refactor this
4   -
5   -* rails 2 uses prototype instead of jquery
6   -
7   -* config/environment.rb maybe still have some code that should be on the initializers
8   -
9   -* initializers session_store.rb inflections.rb... don't exist
10   -
11   -* rails gems version have to be forced on Gemfile or it will use incompatible pre3vious versions (3.1.3)
12   -
13   -* Sweepers are now natively supported on Rails 3. Would be nice to refactor it
14   -
15   -* On Rails 3 it is no more possible to add allowed tags to avoid scape. The html_safe initializer is an option.
16   -
17   -* error when call sqlite_extensiosn
18   -
19   -* error related to action_tracker
20   -
21   -* check FIXME's in script/quick-start
22   -
23   -* check FIXME's in Gemfile
24   -
25   -* Check the FIXME in config/routes.rb
26   -
27   -* rewrite conditional routing. See FIXME in lib/route_if.rb and re-implement using the Rails 3 mechanism - http://guides.rubyonrails.org/routing.html#advanced-constraints
28   -
29   -* check FIXME's in config/environment.rb
30   -
31   -* xss_terminate sucks. We should replace it with the builtin mechanism in Rails 3
32   -
33   -* instance_eval on Ruby 1.9 yields self, so lambdas that are passed to instance_eval and do not accept exactly 1 argument will blow up. See http://www.ruby-forum.com/topic/213313 ... search for instance_eval and fix where necessary. In special, most of the blocks still need fixing.
34   -
35   -* all instances of <% *_form_for ... %> must be changed to <%= instead of <%
36   -
37   -* all ActiveRecord models have to declare explicitly which attributes must be allowed for mass assignment with attr_accessible.
38   -
39   -* check if we need to update config/locales/*
40   -
41   -* check observe_field and labelled_form_for in app/helpers/application_helper.rb
debian/control
  Diff comments   View file @bff221c
... ... @@ -3,25 +3,25 @@ Section: web
3 3 Priority: extra
4 4 Maintainer: Noosfero developers <noosfero-dev@listas.softwarelivre.org>
5 5 Uploaders: Antonio Terceiro <terceiro@colivre.coop.br>
6   -Build-Depends:
7   - debhelper (>= 7.0.50~),
8   - po4a,
9   - ruby-gettext,
10   - ruby-sqlite3,
11   - rake,
12   - rails3 (>= 3.2.19-1~),
13   - ruby-rspec,
14   - ruby-rspec-rails,
15   - ruby-will-paginate,
16   - cucumber,
17   - ruby-cucumber-rails,
18   - ruby-capybara,
19   - ruby-database-cleaner,
20   - ruby-tidy,
21   - ruby-mocha,
22   - imagemagick,
23   - xvfb,
24   - tango-icon-theme,
  6 +Build-Depends: cucumber,
  7 + debhelper (>= 7.0.50~),
  8 + imagemagick,
  9 + po4a,
  10 + rails3 (>= 3.2.21-1~),
  11 + rake,
  12 + ruby-capybara,
  13 + ruby-cucumber-rails,
  14 + ruby-database-cleaner,
  15 + ruby-gettext,
  16 + ruby-mocha,
  17 + ruby-rspec,
  18 + ruby-rspec-rails,
  19 + ruby-selenium-webdriver,
  20 + ruby-sqlite3,
  21 + ruby-tidy,
  22 + ruby-will-paginate,
  23 + tango-icon-theme,
  24 + xvfb
25 25 Standards-Version: 3.8.4
26 26 Homepage: http://noosfero.org/
27 27 Vcs-Git: git://git.colivre.coop.br/noosfero.git
... ... @@ -30,46 +30,43 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
30 30 Package: noosfero
31 31 Architecture: all
32 32 Pre-Depends: ruby1.8 (>= 1.8.7.358)
33   -Depends:
34   - rails3 (>= 3.2.6-1~),
35   - ruby (>= 1:1.9.3),
36   - rake,
37   - ruby-dalli,
38   - ruby-exception-notification,
39   - ruby-gettext,
40   - ruby-fast-gettext,
41   - ruby-pg,
42   - ruby-rmagick,
43   - ruby-redcloth,
44   - ruby-will-paginate (>= 2.3.12-1~),
45   - iso-codes,
46   - ruby-feedparser,
47   - ruby-daemons,
48   - thin,
49   - tango-icon-theme,
50   - ruby-hpricot,
51   - ruby-nokogiri,
52   - ruby-acts-as-taggable-on,
53   - ruby-progressbar,
54   - ruby-prototype-rails,
55   - ruby-rails-autolink,
56   - memcached,
57   - ruby-memcache-client,
58   - ruby-rest-client,
59   - debconf,
60   - dbconfig-common,
61   - adduser,
62   - exim4 | mail-transport-agent,
63   -# to minimize upgrade issues:
64   - ruby-feedparser (>= 0.7-3~),
65   - ruby-eventmachine (>= 0.12.10-4~),
66   - ruby-rack (>= 1.4.5-2~),
67   - ruby-tzinfo (>= 1.1.0-2~),
68   - ruby-minitest,
69   - ${misc:Depends}
70   -Recommends:
71   - postgresql,
72   - postgresql-client
  33 +Depends: adduser,
  34 + dbconfig-common,
  35 + debconf,
  36 + exim4 | mail-transport-agent,
  37 + iso-codes,
  38 + memcached,
  39 + rails3 (>= 3.2.6-1~),
  40 + rake,
  41 + ruby (>= 1:1.9.3),
  42 + ruby-acts-as-taggable-on,
  43 + ruby-daemons,
  44 + ruby-dalli,
  45 + ruby-eventmachine (>= 0.12.10-4~),
  46 + ruby-exception-notification,
  47 + ruby-fast-gettext,
  48 + ruby-feedparser,
  49 + ruby-feedparser (>= 0.7-3~),
  50 + ruby-gettext,
  51 + ruby-hpricot,
  52 + ruby-memcache-client,
  53 + ruby-minitest,
  54 + ruby-nokogiri,
  55 + ruby-pg,
  56 + ruby-progressbar,
  57 + ruby-prototype-rails,
  58 + ruby-rack (>= 1.4.5-2~),
  59 + ruby-rails-autolink,
  60 + ruby-redcloth,
  61 + ruby-rest-client,
  62 + ruby-rmagick,
  63 + ruby-tzinfo (>= 1.1.0-2~),
  64 + ruby-whenever,
  65 + ruby-will-paginate (>= 2.3.12-1~),
  66 + tango-icon-theme,
  67 + thin,
  68 + ${misc:Depends}
  69 +Recommends: postgresql, postgresql-client
73 70 Description: free web-based platform for social networks
74 71 Noosfero is a web platform for social and solidarity economy networks with
75 72 blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
... ...
debian/noosfero.install
  Diff comments   View file @bff221c
1   -app usr/share/noosfero
2   -db usr/share/noosfero
3   -doc usr/share/noosfero
4   -lib usr/share/noosfero
5   -script usr/share/noosfero
6   -util usr/share/noosfero
7 1 Rakefile usr/share/noosfero
8   -vendor usr/share/noosfero
9   -
  2 +app usr/share/noosfero
  3 +baseplugins usr/share/noosfero
  4 +config.ru usr/share/noosfero
10 5 config/application.rb usr/share/noosfero/config
11 6 config/boot.rb usr/share/noosfero/config
12 7 config/environment.rb usr/share/noosfero/config
13 8 config/environments usr/share/noosfero/config
14 9 config/initializers usr/share/noosfero/config
15   -config/routes.rb usr/share/noosfero/config
16 10 config/locales usr/share/noosfero/config
17   -config.ru usr/share/noosfero
18   -
19   -plugins usr/share/noosfero
20   -baseplugins usr/share/noosfero
21   -
  11 +config/routes.rb usr/share/noosfero/config
  12 +db usr/share/noosfero
  13 +debian/database.yml.template usr/share/noosfero/config
22 14 debian/dbinstall usr/lib/noosfero
23 15 debian/dbupgrade usr/lib/noosfero
24   -debian/database.yml.template usr/share/noosfero/config
25   -
26   -public usr/share/noosfero
27   -
28 16 debian/default/noosfero etc/default
29   -etc/init.d/noosfero etc/init.d
  17 +debian/noosfero-check-dbconfig usr/sbin
  18 +debian/noosfero-console usr/sbin
  19 +debian/noosfero.yml etc/noosfero
30 20 debian/thin.yml etc/noosfero
  21 +doc usr/share/noosfero
  22 +doc/noosfero usr/share/noosfero/doc
  23 +etc/init.d/noosfero etc/init.d
31 24 etc/logrotate.d/noosfero etc/logrotate.d
32   -debian/noosfero.yml etc/noosfero
33 25 etc/noosfero/varnish-accept-language.vcl etc/noosfero
34 26 etc/noosfero/varnish-noosfero.vcl etc/noosfero
35   -
  27 +lib usr/share/noosfero
36 28 locale usr/share/noosfero
37   -doc/noosfero usr/share/noosfero/doc
38   -
39   -debian/noosfero-console usr/sbin
40   -debian/noosfero-check-dbconfig usr/sbin
  29 +plugins usr/share/noosfero
  30 +public usr/share/noosfero
  31 +script usr/share/noosfero
  32 +util usr/share/noosfero
  33 +vendor usr/share/noosfero
... ...
script/install-dependencies/debian-wheezy.sh
  Diff comments   View file @bff221c
1   -sources_entry='deb http://download.noosfero.org/debian/wheezy ./'
  1 +sources_entry='deb http://download.noosfero.org/debian/wheezy-1.1 ./'
2 2  
3 3 if ! grep -q "$sources_entry" /etc/apt/sources.list.d/noosfero.list; then
4 4 sudo tee /etc/apt/sources.list.d/noosfero.list <<EOF
... ...