Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/version-2' into version-2
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdan committed Nov 12, 2024
2 parents 5ae09ee + a26b59f commit b1e34a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion spec/datagrid_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
end
end

it "deprecates inclucsion of Datagrid module" do
it "deprecates inclusion of Datagrid module" do
silence_deprecator do
class DeprecatedInclusion
include Datagrid
Expand Down
4 changes: 2 additions & 2 deletions version-2/Readme.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ List of things introduces:

Rails [deprecates form\_for in favor of form\_with](https://guides.rubyonrails.org/form_helpers.html#using-form-tag-and-form-for).

`datagrid_form_for` is now depreacted if favor of `datagrid_form_with`.
`datagrid_form_for` is now deprecated if favor of `datagrid_form_with`.
However, `datagrid_form_for` would also use Rails `form_with` because they share the same view partial.

TODO: update the wiki
Expand Down Expand Up @@ -400,7 +400,7 @@ end

## Remove SASS dependency

SASS is no longer a default choice when starting a rails project.
SASS is no longer a default choice when starting a Ruby on Rails project.
Version 2 makes it more flexible by avoiding the dependency on any particular CSS framework.

See [a new built-in CSS file](../app/assets/stylesheets/datagrid.css).

0 comments on commit b1e34a2

Please sign in to comment.