这是indexloc提供的服务,不要输入任何密码
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: refinery/refinerycms
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: umemi
Choose a base ref
...
head repository: refinery/refinerycms
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 15 files changed
  • 3 contributors

Commits on Apr 23, 2023

  1. Update GitHub Actions workflow to use main branch

    We renamed our `master` branch to `main` but our GitHub Actions workflow
    still references `master`.
    parndt authored Apr 23, 2023
    Configuration menu
    Copy the full SHA
    f996a58 View commit details
    Browse the repository at this point in the history
  2. Specify case-sensitive uniqueness for page part slug (Rails 6 depreca…

    …tion warning)
    n7st authored and parndt committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    4930062 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Fix Zeitwerk conventions for Refinery::Pages::Finder (#3524)

    Resolves #3523
    
    The issue stems from the definition of `Refinery::Pages::Finder` and its sibling classes (`Refinery::Pages::FinderByTitle` and so on). These are all defined beside each other in [`pages/lib/refinery/pages/finder.rb`](https://github.com/refinery/refinerycms/blob/aee49a603860bf7d5fdb1532b9add5f4e7f839f4/pages/lib/refinery/pages/finder.rb) which gets required in [`pages/app/models/refinery/page.rb`](https://github.com/refinery/refinerycms/blob/aee49a603860bf7d5fdb1532b9add5f4e7f839f4/pages/app/models/refinery/page.rb#L6).
    
    When reloading, Zeitwerk reloads the model, which in turn loads the finder again. But because the file is named `finder.rb`, only `Refinery::Pages::Finder` gets unloaded and reloaded again. All other classes stay loaded and would be patched by the reload. But because `Refinery::Pages::Finder` has been reloaded and initialized again, it got a new `object_id`, thus triggering the **`superclass mismatch`** error.
    
    The solution, that fixed the error, was to move all sibling-classes of `Refinery::Pages::Finder` into it, making them children of `Refinery::Pages::Finder`. Because they are only called inside `Refinery::Pages::Finder` itself, this *should* not make problems.
    richard-kramer authored May 12, 2023
    Configuration menu
    Copy the full SHA
    5cbbd14 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Update File.exists? to File.exist? (#3529)

    The former was removed in more recent versions of Ruby.
    parndt authored May 22, 2023
    Configuration menu
    Copy the full SHA
    1d3222b View commit details
    Browse the repository at this point in the history
  2. Fix sqlite3 gsub in Refinery::CmsGenerator (#3530)

    I noticed when running `rails new -m https://www.refinerycms.com/t/edge`
    that it was mangling the `Gemfile` when the `sqlite3` line looked like:
    
    ```ruby
      gem 'sqlite3', '~> 1.4'
    ```
    
    Instead of the expected:
    
    ```ruby
      gem 'sqlite3'
    ```
    
    Our `gsub_file` instruction now captures the entire line and inserts it
    inside the `group :development, :test do` block.
    parndt authored May 22, 2023
    Configuration menu
    Copy the full SHA
    04f07c1 View commit details
    Browse the repository at this point in the history
Loading