Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Rails 5.2 support #5401

Merged
merged 9 commits into from Apr 18, 2018
Merged

Conversation

zorab47
Copy link
Contributor

@zorab47 zorab47 commented Apr 17, 2018

Backport of Rails 5.2 support to the 1.x branch.

@codecov
Copy link

codecov bot commented Apr 17, 2018

Codecov Report

Merging #5401 into 1-2-stable will increase coverage by 0.11%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff              @@
##           1-2-stable   #5401      +/-   ##
=============================================
+ Coverage       97.99%   98.1%   +0.11%     
=============================================
  Files             285     285              
  Lines           11059   11045      -14     
=============================================
- Hits            10837   10836       -1     
+ Misses            222     209      -13
Impacted Files Coverage Δ
...nit/authorization/controller_authorization_spec.rb 100% <100%> (ø) ⬆️
lib/active_admin/order_clause.rb 100% <100%> (ø) ⬆️
features/support/selectors.rb 70% <0%> (-7.78%) ⬇️
features/support/paths.rb 81.48% <0%> (-3.14%) ⬇️
features/step_definitions/additional_web_steps.rb 88.88% <0%> (-2.03%) ⬇️
lib/active_admin/filters/formtastic_addons.rb 93.54% <0%> (-0.21%) ⬇️
lib/active_admin/abstract_view_factory.rb 94.73% <0%> (-0.14%) ⬇️
lib/active_admin/view_helpers/display_helper.rb 98% <0%> (-0.08%) ⬇️
lib/active_admin/page.rb 98.07% <0%> (-0.08%) ⬇️
spec/unit/csv_builder_spec.rb 97.75% <0%> (-0.02%) ⬇️
... and 39 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fed8657...4993610. Read the comment docs.

s.add_dependency 'ransack', '>= 1.8.7'
s.add_dependency 'sass', '~> 3.4'
s.add_dependency 'sprockets', '>= 3.0', '< 4.1'
s.add_dependency 'sprockets-es6', '>= 0.9.2'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ES6 is 2.0.alpha only?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I merged in a bit too much there.

@zorab47 zorab47 force-pushed the 1-2-stable-backport-of-rails52 branch from 62105a5 to 4993610 Compare April 18, 2018 11:58
@varyonic varyonic merged commit 575c9d6 into 1-2-stable Apr 18, 2018
@zorab47 zorab47 deleted the 1-2-stable-backport-of-rails52 branch April 18, 2018 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants