Skip to content

Commit

Permalink
tests
Browse files Browse the repository at this point in the history
  • Loading branch information
microstudi committed Aug 16, 2023
1 parent 9b8a5c1 commit 6126ad8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 2.7.7

jobs:
lint-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 2.7.7

jobs:
test-report:
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ DEPENDENCIES
web-console

RUBY VERSION
ruby 2.7.6p219
ruby 2.7.7p221

BUNDLED WITH
2.3.20
2.4.6
13 changes: 7 additions & 6 deletions lib/decidim/civicrm/admin_engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ class AdminEngine < ::Rails::Engine

initializer "decidim.civicrm.admin_menu" do
Decidim.menu :admin_menu do |menu|
menu.item I18n.t("menu.civicrm", scope: "decidim.admin", default: "CiViCRM"),
decidim_civicrm_admin.info_index_path,
icon_name: "people",
position: 5.75,
active: is_active_link?(decidim_civicrm_admin.info_index_path, :inclusive),
if: defined?(current_user) && current_user&.read_attribute("admin")
menu.add_item :civicrm,
I18n.t("menu.civicrm", scope: "decidim.admin", default: "CiViCRM"),
decidim_civicrm_admin.info_index_path,
icon_name: "people",
position: 5.75,
active: is_active_link?(decidim_civicrm_admin.info_index_path, :inclusive),
if: defined?(current_user) && current_user&.read_attribute("admin")
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/lib/overrides_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package: "decidim-core",
files: {
"/app/commands/decidim/create_omniauth_registration.rb" => "10fc028fa6a7bef9936e6f9edb9b167b",
"/app/commands/decidim/update_account.rb" => "29d81617f5bf1af310d2777a916b4d8b"
"/app/commands/decidim/update_account.rb" => "012e0dcd584135fa70ba6bd323540f7c"
}
},
{
Expand Down

0 comments on commit 6126ad8

Please sign in to comment.