[Git][noosfero/noosfero][master] 8 commits: Fixing installation in debian stretch

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
ce972bb6 by Alax Alves at 2019-06-03T19:44:26Z
Fixing installation in debian stretch

- - - - -
96e5547f by Matheus Richard at 2019-06-11T13:42:29Z
Fixes chrome version

- - - - -
83744724 by Alax Alves at 2019-06-11T13:48:23Z
Merge branch 'fixes-plugin-tests' of https://gitlab.com/matheusrich/noosfero into fix-install

- - - - -
abd8a7bc by Alax Alves at 2019-06-11T15:06:32Z
Downgrading sprockets-rails version

- - - - -
322fc4e1 by Alax Alves at 2019-06-13T13:52:19Z
Fixing vote plugin test

- - - - -
e900f4ac by Alax Alves at 2019-06-17T13:03:20Z
Merge branch 'master' of https://gitlab.com/noosfero/noosfero into fix-install

- - - - -
6b05e0cb by Alax Alves at 2019-06-17T13:04:21Z
Removing annoying test

- - - - -
8a2ed111 by Rodrigo Souto at 2019-06-17T15:13:51Z
Merge branch 'fix-install' into 'master'

Fixing installation in debian stretch

See merge request noosfero/noosfero!1687
- - - - -


4 changed files:

- Gemfile.lock
- app/helpers/layout_helper.rb
- − plugins/vote/features/vote.feature
- script/install-dependencies/debian-stretch.sh


Changes:

=====================================
Gemfile.lock
=====================================
@@ -291,7 +291,7 @@ GEM
       http-2 (= 0.9.0)
     netrc (0.11.0)
     nio4r (2.3.1)
-    nokogiri (1.10.2)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
     parser (2.5.3.0)
@@ -302,7 +302,7 @@ GEM
     protected_attributes_continued (1.3.0)
       activemodel (~> 5.0)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-contrib (2.1.0)
@@ -437,10 +437,10 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     temple (0.8.0)
     test-unit (3.2.8)
       power_assert
@@ -569,7 +569,7 @@ DEPENDENCIES
   simplecov
   slim
   spring
-  sprockets-rails
+  sprockets-rails (~> 2.3.3)
   test-unit
   tinymce-rails (~> 4.8, >= 4.8.2)
   tinymce-rails-langs (~> 4.2)


=====================================
app/helpers/layout_helper.rb
=====================================
@@ -71,9 +71,9 @@ module LayoutHelper
       output << stylesheet_link_tag(global_css_pub)
     end
 
-    if File.exists?(File.join(Rails.root.join, 'public', theme_stylesheet_path))
+    # if File.exists?(File.join(Rails.root.join, 'public', theme_stylesheet_path))
       output << stylesheet_link_tag(theme_stylesheet_path)
-    end
+    # end
 
     # This output should be safe!
     output.join("\n").html_safe


=====================================
plugins/vote/features/vote.feature deleted
=====================================
@@ -1,28 +0,0 @@
-Feature: search contents
-  As a noosfero user
-  I want to vote in some content
-
-  Background:
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And "joaosilva" has no articles
-    And the following articles
-      | owner     | name           | body               |
-      | joaosilva | Sample Article | This is an article |
-    And plugin Vote is enabled on environment
-    And I am logged in as "joaosilva"
-
-  @selenium
-  Scenario: liking an article
-    Given I go to /joaosilva/sample-article
-    And I click ".like-action a"
-    Then I should see "1" within ".like-action .like-action-counter"
-    And I should see "0" within ".dislike-action .like-action-counter"
-
-  @selenium
-  Scenario: liking an article
-    Given I go to /joaosilva/sample-article
-    And I click ".dislike-action a"
-    Then I should see "0" within ".like-action .like-action-counter"
-    And I should see "1" within ".dislike-action .like-action-counter"


=====================================
script/install-dependencies/debian-stretch.sh
=====================================
@@ -1,5 +1,10 @@
-sudo apt-get install -y fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatspi2.0-0 libgtk-3-0 libnspr4 libnss3 libx11-xcb1 libxss1 libxtst6 xdg-utils
-sudo wget https://www.slimjet.com/chrome/download-chrome.php?file=files%2F71.0.3578.80%2Fgoogle-chrome-stable_current_amd64.deb -O google-chrome-stable_current_amd64.deb
+sudo apt-get update
+sudo apt-get install -y fonts-liberation libappindicator3-1 libasound2 \
+                        libatk-bridge2.0-0 libatspi2.0-0 libgtk-3-0 libnspr4 \
+                        libnss3 libx11-xcb1 libxss1 libxtst6 xdg-utils \
+                        apt-transport-https
+sudo wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+          -O google-chrome-stable_current_amd64.deb
 sudo dpkg -i google-chrome-stable_current_amd64.deb
-rm google-chrome-stable_current_amd64.deb
+sudo rm google-chrome-stable_current_amd64.deb
 run bundle



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/b03e578746c14c51a4a010a3320d621a46352870...8a2ed111c35e30595dcac935485c78af13fcb57f

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/b03e578746c14c51a4a010a3320d621a46352870...8a2ed111c35e30595dcac935485c78af13fcb57f
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20190617/b8ad4d22/attachment-0001.html>