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: consuldemocracy/consuldemocracy Loading
base: 2a96dfb
Choose a base ref
...
head repository: consuldemocracy/consuldemocracy Loading
compare: 07954f8
Choose a head ref
  • 11 commits
  • 107 files changed
  • 5 contributors

Commits on Jun 4, 2021

  1. Configuration menu
    Copy the full SHA
    8991bb0 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2021

  1. Configuration menu
    Copy the full SHA
    4dbc027 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2021

  1. Bump globalize from 5.3.1 to 6.0.1

    Bumps [globalize](https://github.com/globalize/globalize) from 5.3.1 to 6.0.1.
    - [Release notes](https://github.com/globalize/globalize/releases)
    - [Changelog](https://github.com/globalize/globalize/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/globalize/globalize/commits)
    
    ---
    updated-dependencies:
    - dependency-name: globalize
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    6072372 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2021

  1. Merge pull request #4641 from consul/dependabot/bundler/master/global…

    …ize-6.0.1
    
    Bump globalize from 5.3.1 to 6.0.1
    javierm committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    e7da2cb View commit details
    Browse the repository at this point in the history
  2. Extract component to render a date range

    Note we're using the `call` method (which is equivalent to adding an ERB
    file) because we were getting an error calling `render` from the `dates`
    method:
    
    ```
    ActionView::Base#lookup_context delegated to
    view_renderer.lookup_context, but view_renderer is nil:
    ```
    
    It might be because we aren't rendering the
    `Adming::Budgets::DurationComponent` but just calling one method, and so
    there's no view context in this case.
    javierm committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    89436b5 View commit details
    Browse the repository at this point in the history
  3. Move related list partial to a component

    This way the code is easier to follow; the code checking whether the
    list has contents is in the partial rendering the list.
    
    We also remove some duplication setting up related content in the
    controllers.
    
    For some reason, we have to manually ignore i18n keys which were
    automatically ignored when the code was in the view.
    javierm committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    c8d8fae View commit details
    Browse the repository at this point in the history
  4. Add experimental machine learning

    Machine Learning authored and javierm committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    4d27bbe View commit details
    Browse the repository at this point in the history
  5. Merge pull request #4585 from consul/experimental_machine_learning

    Add experimental machine learning
    javierm committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    8991d93 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2021

  1. Merge pull request #4538 from andyjdavis/notificationTranslation

    replace the word message with notification on proposal notification s…
    javierm committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    9c8ee57 View commit details
    Browse the repository at this point in the history
  2. Upgrade Ruby to version 2.7.4

    Note this version includes Bundler 2, so we can finally upgrade.
    javierm committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    5674fe5 View commit details
    Browse the repository at this point in the history
  3. Supress warnings in Paperclip::UrlGenerator

    We were getting hundreds of "warning: URI.escape is obsolete" messages.
    So we're using `URI::DEFAULT_PARSER.escape` instead.
    
    IMHO it's OK to add this monkey-patch because we're replacing Paperclip
    with Active Storage, and when we finish with that we'll delete this
    file.
    javierm committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    07954f8 View commit details
    Browse the repository at this point in the history
Loading