Upstream #1678

decabeza · 2018-10-20T11:17:18Z

Objectives

This PR sync this repo with some changes made on CONSUL repo including the following PRs:

Adds logic to show 'see results' button only for finished budgets Adds logic to show 'see results' button only for finished budgets consuldemocracy/consuldemocracy#2804
Translate static pages Translate static pages consuldemocracy/consuldemocracy#2834
Configurable top right and main navigation menus Configurable Top Right and Main Navigation Menus consuldemocracy/consuldemocracy#2785
Upgrade gem coffee-rails to version 4.2.2 Upgrade gem coffee-rails to version 4.2.2 consuldemocracy/consuldemocracy#2837
Fix a misleading comment Fix a misleading comment consuldemocracy/consuldemocracy#2844
Fix Rubocop warnings for Admin controllers Fix Rubocop warnings for Admin controllers consuldemocracy/consuldemocracy#2880
Bump mdl from 0.4.0 to 0.5.0 Bump mdl from 0.4.0 to 0.5.0 consuldemocracy/consuldemocracy#2892
Bump scss_lint from 0.54.0 to 0.55.0 Bump scss_lint from 0.54.0 to 0.55.0 consuldemocracy/consuldemocracy#2895
Bump unicorn from 5.4.0 to 5.4.1 Bump unicorn from 5.4.0 to 5.4.1 consuldemocracy/consuldemocracy#2894
[Security] Bump rubyzip from 1.2.1 to 1.2.2 [Security] Bump rubyzip from 1.2.1 to 1.2.2 consuldemocracy/consuldemocracy#2879
[Security] Bump ffi from 1.9.23 to 1.9.25 [Security] Bump ffi from 1.9.23 to 1.9.25 consuldemocracy/consuldemocracy#2877
[Security] Bump nokogiri from 1.8.2 to 1.8.4 [Security] Bump nokogiri from 1.8.2 to 1.8.4 consuldemocracy/consuldemocracy#2878
Bump savon from 2.11.2 to 2.12.0 Bump savon from 2.11.2 to 2.12.0 consuldemocracy/consuldemocracy#2891
Add placeholder configuration for SMTP Add placeholder configuration for SMTP consuldemocracy/consuldemocracy#2900
Show active tab in custom info texts Show active tab in custom info texts consuldemocracy/consuldemocracy#2898
Bump ancestry from 3.0.1 to 3.0.2 Bump ancestry from 3.0.1 to 3.0.2 consuldemocracy/consuldemocracy#2908
Bump paranoia from 2.4.0 to 2.4.1 Bump paranoia from 2.4.0 to 2.4.1 consuldemocracy/consuldemocracy#2909
Bump coveralls from 0.8.21 to 0.8.22 Bump coveralls from 0.8.21 to 0.8.22 consuldemocracy/consuldemocracy#2905

Backport

Backport the last commit to fix houndci-bot warnings in the CONSUL repo too.

houndci-bot · 2018-10-20T11:17:35Z

spec/features/site_customization/content_blocks_spec.rb

+
+  scenario "main navigation right" do
+    create(:site_customization_content_block, name: "subnavigation_right", locale: "en", body: "content for right links")
+    create(:site_customization_content_block, name: "subnavigation_right", locale: "es", body: "contenido para right links")


Metrics/LineLength: Line is too long. [124/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:36Z

spec/features/site_customization/content_blocks_spec.rb

+  end
+
+  scenario "main navigation right" do
+    create(:site_customization_content_block, name: "subnavigation_right", locale: "en", body: "content for right links")


Metrics/LineLength: Line is too long. [121/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:36Z

spec/features/site_customization/content_blocks_spec.rb

+
+  scenario "main navigation left" do
+    create(:site_customization_content_block, name: "subnavigation_left", locale: "en", body: "content for left links")
+    create(:site_customization_content_block, name: "subnavigation_left", locale: "es", body: "contenido para left links")


Metrics/LineLength: Line is too long. [122/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:36Z

spec/features/site_customization/content_blocks_spec.rb

@@ -30,4 +30,34 @@
    expect(page).to have_content("contenido para footer")
    expect(page).not_to have_content("content for footer")
  end
+
+  scenario "main navigation left" do
+    create(:site_customization_content_block, name: "subnavigation_left", locale: "en", body: "content for left links")


Metrics/LineLength: Line is too long. [119/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:36Z

spec/features/admin/budget_investments_spec.rb

+      expect(page).to have_content "See results"
+    end
+
+    scenario "See results button does not appear for unfinished budgets" do


RSpec/RepeatedDescription: Don't repeat descriptions within an example group. (http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/RepeatedDescription)
RSpec/RepeatedExample: Don't repeat examples within an example group. (http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/RepeatedExample)

houndci-bot · 2018-10-20T11:17:36Z

spec/features/admin/site_customization/content_blocks_spec.rb

@@ -50,7 +50,7 @@

      click_link "Create new content block"

-      select "top_links", from: "site_customization_content_block_name"
+      select I18n.t("admin.site_customization.content_blocks.content_block.names.top_links"), from: "site_customization_content_block_name"


Metrics/LineLength: Line is too long. [139/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:37Z

spec/features/admin/site_customization/content_blocks_spec.rb

@@ -27,7 +27,7 @@

      click_link "Create new content block"

-      select "footer", from: "site_customization_content_block_name"
+      select I18n.t("admin.site_customization.content_blocks.content_block.names.footer"), from: "site_customization_content_block_name"


Metrics/LineLength: Line is too long. [136/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:37Z

spec/features/admin/site_customization/information_texts_spec.rb

+    visit admin_site_customization_information_texts_path
+
+    click_link 'Proposals'
+    expect(find("a[href=\"/admin/site_customization/information_texts?tab=proposals\"].is-active")).to have_content "Proposals"


Metrics/LineLength: Line is too long. [127/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2018-10-20T11:17:37Z

spec/features/admin/site_customization/information_texts_spec.rb

@@ -48,6 +48,13 @@
    click_link 'Welcome'
    expect(page).to have_content 'See all recommended debates'
  end
+


Layout/TrailingWhitespace: Trailing whitespace detected. (https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace)

houndci-bot · 2018-10-20T11:17:37Z

app/models/site_customization/content_block.rb

@@ -1,5 +1,5 @@
 class SiteCustomization::ContentBlock < ActiveRecord::Base
-  VALID_BLOCKS = %w(top_links footer)
+  VALID_BLOCKS = %w(top_links footer subnavigation_left subnavigation_right)


Style/PercentLiteralDelimiters: %w-literals should be delimited by [ and ]. (https://github.com/bbatsov/ruby-style-guide#percent-literal-braces)

voodoorai2000

🙌🏻

voodoorai2000

🙌

Changes introduced in commits 41f66fa and dc87b75 will render the 'See results' button under `admin/budget_investments` only if a finished budget has winner investments associated with it

Bumps [mdl](https://github.com/mivok/markdownlint) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/mivok/markdownlint/releases) - [Changelog](https://github.com/markdownlint/markdownlint/blob/master/CHANGELOG.md) - [Commits](markdownlint/markdownlint@v0.4.0...v0.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [scss_lint](https://github.com/brigade/scss-lint) from 0.54.0 to 0.55.0. - [Release notes](https://github.com/brigade/scss-lint/releases) - [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md) - [Commits](sds/scss-lint@v0.54.0...v0.55.0) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.0 to 5.4.1. Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.** - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](rubyzip/rubyzip@v1.2.1...v1.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [ffi](https://github.com/ffi/ffi) from 1.9.23 to 1.9.25. **This update includes security fixes.** - [Release notes](https://github.com/ffi/ffi/releases) - [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md) - [Commits](ffi/ffi@1.9.23...1.9.25) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.2 to 1.8.4. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.2...v1.8.4) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [savon](https://github.com/savonrb/savon) from 2.11.2 to 2.12.0. - [Release notes](https://github.com/savonrb/savon/releases) - [Changelog](https://github.com/savonrb/savon/blob/master/CHANGELOG.md) - [Commits](savonrb/savon@v2.11.2...v2.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 8.2.0 to 9.1.4. - [Release notes](https://github.com/ai/autoprefixer-rails/releases) - [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md) - [Commits](ai/autoprefixer-rails@8.2.0...9.1.4) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](capistrano/rails@v1.3.1...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [ancestry](https://github.com/stefankroes/ancestry) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/stefankroes/ancestry/releases) - [Changelog](https://github.com/stefankroes/ancestry/blob/master/CHANGELOG.md) - [Commits](stefankroes/ancestry@v3.0.1...v3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [paranoia](https://github.com/rubysherpas/paranoia) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/rubysherpas/paranoia/releases) - [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md) - [Commits](rubysherpas/paranoia@v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [coveralls](https://coveralls.io) from 0.8.21 to 0.8.22. Signed-off-by: dependabot[bot] <support@dependabot.com>

This reverts commit 1548c6bff31f0398a95e8cda28a4802ec1803d2e.

houndci-bot reviewed Oct 20, 2018

View reviewed changes

decabeza force-pushed the upstream branch from 13154de to 72c460b Compare October 20, 2018 11:29

decabeza added the Backport Needed label Oct 20, 2018

voodoorai2000 approved these changes Oct 22, 2018

View reviewed changes

MariaCheca and others added 22 commits October 29, 2018 14:20

Adds logic to show 'see results' button only for finished budgets

db6c664

Add budget investment factory to fix failing scenario

43b2895

Changes introduced in commits 41f66fa and dc87b75 will render the 'See results' button under `admin/budget_investments` only if a finished budget has winner investments associated with it

Moves custom pages content to custom pages folder

2014aef

Translate static pages

2b5d9ec

Adds configurable top right and main navigation menus

4b8d6b4

Bumped coffee-rails to v4.2.2

e55e0bc

Fix a misleading comment

ee4a925

Fix Rubocop warnings for Admin controllers [ci skip]

1dab06e

Bump unicorn from 5.4.0 to 5.4.1

ff1ebbb

Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.0 to 5.4.1. Signed-off-by: dependabot[bot] <support@dependabot.com>

Add placeholder configuration for SMTP

9f3b2e2

Show active tab in custom info texts

a01b37a

Add Spec

1e9741f

dependabot-support and others added 4 commits October 29, 2018 14:20

Bump coveralls from 0.8.21 to 0.8.22

2d52386

Bumps [coveralls](https://coveralls.io) from 0.8.21 to 0.8.22. Signed-off-by: dependabot[bot] <support@dependabot.com>

Removes duplicated specs

6fe0522

Fixes houndci-bot warnings

708cac6

Revert "Bump autoprefixer-rails from 8.2.0 to 9.1.4"

5bd64a8

This reverts commit 1548c6bff31f0398a95e8cda28a4802ec1803d2e.

decabeza force-pushed the upstream branch from 69390d5 to 5bd64a8 Compare October 29, 2018 13:21

decabeza merged commit ab99e1c into master Oct 29, 2018

decabeza mentioned this pull request Oct 30, 2018

[Backport] Code format consuldemocracy/consuldemocracy#2993

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream #1678

Upstream #1678

decabeza commented Oct 20, 2018 •

edited

Loading

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

houndci-bot Oct 20, 2018

voodoorai2000 left a comment

voodoorai2000 left a comment

Upstream #1678

Upstream #1678

Conversation

decabeza commented Oct 20, 2018 • edited Loading

Objectives

Backport

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

voodoorai2000 left a comment

Choose a reason for hiding this comment

voodoorai2000 left a comment

Choose a reason for hiding this comment

decabeza commented Oct 20, 2018 •

edited

Loading