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: solidusio/solidus Loading
base: v4.1.4
Choose a base ref
...
head repository: solidusio/solidus Loading
compare: v4.1.5
Choose a head ref
  • 18 commits
  • 19 files changed
  • 6 contributors

Commits on Jan 5, 2024

  1. Post-release chores after having released Solidus v4.1.4

    This code has been automatically generated by our 'Prepare post-release' GitHub
    action.
    
    Make sure that:
    
    - [ ] The new release has been published, along with its tag. See https://github.com/solidusio/solidus/releases/tag/v4.1.4
    - [ ] The corresponding patch branch exists. See https://github.com/solidusio/solidus/tree/v4.1
    - [ ] The corresponding backport-v4.1 label exists. See https://github.com/solidusio/solidus/labels
    elia committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    9353e28 View commit details
    Browse the repository at this point in the history
  2. Backport rake tasks from main

    elia committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    226a2b8 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5588 from solidusio/github-actions/7424473997-1-1…

    …704473567
    
    Post-release chores after having released Solidus v4.1.4
    elia committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    ccdf0d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Allow "sqlite3" as ENV["DB"]

    Since solidus-orbs-extension v0.10.0, the CI runner will set the ENV var
    for sqlite to be `sqlite3`, which currently raises an error.
    
    (cherry picked from commit 8070485)
    mamhoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    4321f72 View commit details
    Browse the repository at this point in the history
  2. Dummy App generator: Use db var instead of ENV var

    A couple of lines before this change, we already normalize `ENV['db']`.
    We lose that work by relying on the raw ENV var here.
    
    (cherry picked from commit 1411fc9)
    mamhoff committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    27f3043 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5617 from solidusio/backport/v4.1/pr-5613

    [v4.1] [v4.2] Allow "sqlite3" as ENV["DB"]
    spaghetticode committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    19d4b07 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #5626 from solidusio/backport/v4.1/pr-5623

    [v4.1] Dummy App generator: Use db var instead of ENV var
    spaghetticode committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    56fd0e9 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Skip ActionCable for Dummy Apps

    We don't really use ActionCable for anything as far as I know. Having it
    makes installing Turbo/Stimulus in extensions harder.
    
    The installer for Turbo will look for a Gemfile in `Rails.root`, which is not
    there in case of the dummy app, and fail. If, however, `config/cable.yml` can't be
    found, the Turbo installer succeeds with a message that Turbo is
    installed, just without the broadcasting feature (which is alright for
    most apps I believe).
    
    (cherry picked from commit 3f8ad82)
    mamhoff committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    71352e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Merge pull request #5630 from solidusio/backport/v4.1/pr-5420

    [v4.1] Skip `ActionCable` for dummy apps
    tvdeyen committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    ceba4e8 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Explicitly require URI in app configuration

    Without this we get
    
        uninitialized constant Spree::AppConfiguration::URI
    
    errors.
    
    (cherry picked from commit c303691)
    tvdeyen committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    59f444b View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Merge pull request #5646 from solidusio/backport/v4.1/pr-5644

    [v4.1] Explicitly require URI in app configuration
    tvdeyen committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    9394f9f View commit details
    Browse the repository at this point in the history
  2. Fix safe Rubocop offenses

    Fixed with
    
        rubocop -a
    tvdeyen committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    bea1caa View commit details
    Browse the repository at this point in the history
  3. Fix unsafe rubocop offenses

    Using
    
        rubocop -A
    
    and verified they are safe.
    tvdeyen committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    1dbb597 View commit details
    Browse the repository at this point in the history
  4. Disable Rubocop self assign check in order state machine

    Cherry Picked from bc3944d
    
    Co-Authored-By: Elia Schito <[email protected]>
    tvdeyen and elia committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    3080632 View commit details
    Browse the repository at this point in the history
  5. Disable Rails/RakeEnvironment cop

    We have tasks that are not needing the Rails environment for builds and such that are not in the Rails app
    
    Rubocop flags those by mistake because it does not know we are not an
    app, but an engine.
    tvdeyen committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    042193c View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Merge pull request #5654 from tvdeyen/4.1-rubocop

    [4.1] Fix latest rubocop offenses
    tvdeyen committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    3537d98 View commit details
    Browse the repository at this point in the history
  2. Prepare release for Solidus v4.1.5

    This code has been automatically generated by our 'Prepare release' GitHub
    action.
    
    The actual release is not part of the automation, and it still needs to be manually done by a maintainer.
    tvdeyen committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    7dfb2dc View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5708 from solidusio/github-actions/8568034259-2-1…

    …712311186
    
    Prepare release for Solidus v4.1.5
    tvdeyen committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    61626a1 View commit details
    Browse the repository at this point in the history
Loading