-
Notifications
You must be signed in to change notification settings - Fork 197
Comparing changes
Open a pull request
base repository: merit-gem/merit
base: v3.0.1
head repository: merit-gem/merit
compare: master
Commits on Feb 14, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 4436e38 - Browse repository at this point
Copy the full SHA 4436e38View commit details
Commits on Apr 23, 2018
-
Reproduce the rails 5.1 compatiability issue
Rails 5.1 and above add automatic validation for belongs_to association. It is enabled by an initializer added to new projects. Adding that configuartion in dummy app will reproduce the issue in test case
2Configuration menu - View commit details
-
Copy full SHA for 27c4a5c - Browse repository at this point
Copy the full SHA 27c4a5cView commit details
Commits on Apr 24, 2018
-
Merge pull request #287 from redtachyons/master
Make Sash an optional dependency, fixing issues in Rails 5.1.
Configuration menu - View commit details
-
Copy full SHA for e3fb177 - Browse repository at this point
Copy the full SHA e3fb177View commit details
Commits on Jun 24, 2018
-
Update Ruby and Rails versions
- Drops EOL'd Rails 5.0 - Mocha doesn't need to be locked to an older version - Fix deprecation around `ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer` - Fix Travis CI issue: travis-ci/travis-ci#8969 - Include fix in Rails 5-2-stable: rails/rails#31324
Configuration menu - View commit details
-
Copy full SHA for 406fae3 - Browse repository at this point
Copy the full SHA 406fae3View commit details
Commits on Jul 23, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 1a1856d - Browse repository at this point
Copy the full SHA 1a1856dView commit details -
Initialise merit for API only apps when needed
Previously merit was initialised once when action_controller was loaded, but that could happen either for base or for API, and if the app was configured for the other one Merit wouldn't run. After rails/rails#28402 we can specifically hook in to web or API, thus removing the need for the `run_once` option. Thank you for your work on this, @jamesjefferies. [fixes #297]
Configuration menu - View commit details
-
Copy full SHA for 3371034 - Browse repository at this point
Copy the full SHA 3371034View commit details -
Configuration menu - View commit details
-
Copy full SHA for a571211 - Browse repository at this point
Copy the full SHA a571211View commit details
Commits on Aug 14, 2018
-
* Added `.to_s` on `Merit::Badge#by_name`, so the method will always compare strings, even when we define badge names as symbols.
Configuration menu - View commit details
-
Copy full SHA for 591122e - Browse repository at this point
Copy the full SHA 591122eView commit details
Commits on Oct 17, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 50be966 - Browse repository at this point
Copy the full SHA 50be966View commit details
Commits on Feb 21, 2019
-
- Adds new ruby version to CI builds - Replaces `update_attributes` with `update`, in preparation for Rails 6.0 deprecation notice: DEPRECATION WARNING: update_attributes is deprecated and will be removed from Rails 6.1 - Specify version of sqlite3 for tests
Configuration menu - View commit details
-
Copy full SHA for e24acbb - Browse repository at this point
Copy the full SHA e24acbbView commit details
Commits on Jul 25, 2019
-
Use find_each in Merit::Action.check_unprocessed (#332)
Use find_each in favor of map - Process `Merit::Action.check_unprocessed` in batches
Configuration menu - View commit details
-
Copy full SHA for e23df0e - Browse repository at this point
Copy the full SHA e23df0eView commit details
Commits on Aug 30, 2019
-
- Drops `attr_accessible` pre-Rails 5 syntax - Drops testing scaffold for Mongoid - Drop patch versions for Ruby and Rails from travis configuration - Drop testing with EOL'd Ruby 2.3 and security maintenance 2.4
Configuration menu - View commit details
-
Copy full SHA for 313ac06 - Browse repository at this point
Copy the full SHA 313ac06View commit details -
Configuration menu - View commit details
-
Copy full SHA for be15e47 - Browse repository at this point
Copy the full SHA be15e47View commit details -
Release merit v3.0.3, update NEWS
Removes Hound badge (I don't think it's still reviewing PRs here).
Configuration menu - View commit details
-
Copy full SHA for 7c75bab - Browse repository at this point
Copy the full SHA 7c75babView commit details
Commits on Sep 2, 2019
-
In production project, we encountered that integer is too short for storing score points.
Configuration menu - View commit details
-
Copy full SHA for 9271dc5 - Browse repository at this point
Copy the full SHA 9271dc5View commit details
Commits on Mar 27, 2020
-
Configuration menu - View commit details
-
Copy full SHA for a80ba47 - Browse repository at this point
Copy the full SHA a80ba47View commit details
Commits on Mar 29, 2020
-
Configuration menu - View commit details
-
Copy full SHA for b32f875 - Browse repository at this point
Copy the full SHA b32f875View commit details -
Merit hasn't been running automated tests on mongo id since: ``` commit c6ec066 Author: Tute Costa <tutecosta@gmail.com> Date: Sun Nov 9 14:27:10 2014 -0500 ``` I don't use it in any deployment with this configuration so I can't maintain it. I won't be able to test whether this code loads properly with Zeitwerk, so removing for now. If you need this code in your deployment, feel free to send a PR reverting this commit and ensuring CI runs tests against it. Also: - Stops testing on unmaintained Rails 5.1. - Drops unused JS files from dummy test app
Configuration menu - View commit details
-
Copy full SHA for 4af5aec - Browse repository at this point
Copy the full SHA 4af5aecView commit details
Commits on Apr 25, 2020
-
Configuration menu - View commit details
-
Copy full SHA for cadecc5 - Browse repository at this point
Copy the full SHA cadecc5View commit details
Commits on May 6, 2020
-
Add info on namespaced controllers to README (#339)
I think the Api namespace is definitely common enough to warrant its own little example? I wished I could have found this here instead of having to look through a lot of issue threads to finally understand this! Especially the model_name part on a namespace controller. Co-authored-by: Tute Costa <tutecosta@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for c8c792c - Browse repository at this point
Copy the full SHA c8c792cView commit details -
- Fix ClassMethods file and class name - Auto load ActiveRecord models - Fix generators - `judge.public_send` in favor of bare `send`
Configuration menu - View commit details
-
Copy full SHA for 9f1b6b0 - Browse repository at this point
Copy the full SHA 9f1b6b0View commit details
Commits on Jun 2, 2020
-
Configuration menu - View commit details
-
Copy full SHA for bde91e0 - Browse repository at this point
Copy the full SHA bde91e0View commit details
Commits on Jun 13, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 294fd12 - Browse repository at this point
Copy the full SHA 294fd12View commit details
Commits on Jul 21, 2020
-
Correct typo in initializer template
will be used to grand badge => will be used to grant badge
Configuration menu - View commit details
-
Copy full SHA for ea936eb - Browse repository at this point
Copy the full SHA ea936ebView commit details
Commits on Jul 22, 2020
-
Remove :orm hooks for the (now) unsupported generator options which were causing deprecation notices in thor versions > 1.0.0.
Configuration menu - View commit details
-
Copy full SHA for 622d74f - Browse repository at this point
Copy the full SHA 622d74fView commit details
Commits on Aug 15, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 587f8a4 - Browse repository at this point
Copy the full SHA 587f8a4View commit details -
Configuration menu - View commit details
-
Copy full SHA for cc73f1f - Browse repository at this point
Copy the full SHA cc73f1fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b13552 - Browse repository at this point
Copy the full SHA 0b13552View commit details -
Don’t send “removed badge” notifications when user doesn’t have the badge. [fixes #288]
Configuration menu - View commit details
-
Copy full SHA for c0dacca - Browse repository at this point
Copy the full SHA c0daccaView commit details
Commits on Dec 29, 2020
-
Test with Ruby 3 and Rails 6.1
Excludes Rails 5.2 with Ruby 3, fails with: /home/travis/build/merit-gem/merit/vendor/bundle/ruby/3.0.0/gems/actionpack-5.2.4.4/lib/action_dispatch/middleware/static.rb:111:in `initialize': wrong number of arguments (given 3, expected 2) (ArgumentError) See https://travis-ci.org/github/merit-gem/merit/jobs/752017368
Configuration menu - View commit details
-
Copy full SHA for e67a411 - Browse repository at this point
Copy the full SHA e67a411View commit details
Commits on Apr 8, 2021
-
Fixes Rails autoloader deprecation warnings (#354)
Fixes: ``` DEPRECATION WARNING: Initialization autoloaded the constants ActionText::ContentHelper, ActionText::TagHelper, Merit::BadgeRules, and Merit::PointRules ``` Also fixes `DEPRECATION WARNING: Initialization autoloaded the constant Merit::Badge` by: - Wrapping `Merit::Badge.create` with `Rails.application.reloader.to_prepare` in `README.md` - Adding `Rails.application.reloader.to_prepare` to `merit.erb` template
Configuration menu - View commit details
-
Copy full SHA for bc04e6d - Browse repository at this point
Copy the full SHA bc04e6dView commit details
Commits on Apr 9, 2021
-
Add index on merit_actions.processed column (#356)
* add index to migration template * add index to dummy app [closes #355]
Configuration menu - View commit details
-
Copy full SHA for 537275d - Browse repository at this point
Copy the full SHA 537275dView commit details -
Configuration menu - View commit details
-
Copy full SHA for b002ab9 - Browse repository at this point
Copy the full SHA b002ab9View commit details
Commits on May 25, 2021
-
Fix merit_actions migration template (#357)
if `add_index` is outside of the `def self.change` method, it's executed right away, and: Caused by: ActiveRecord::StatementInvalid: PG::UndefinedTable: ERROR: relation "merit_actions" does not exist
Configuration menu - View commit details
-
Copy full SHA for bd48a4d - Browse repository at this point
Copy the full SHA bd48a4dView commit details
Commits on Mar 5, 2022
-
Fix: warning: previous definition messages (#363)
When app reload is triggered, following warnings were spamming the console, especially running DelayedJob which reloads app every 5 seconds when running: Fix: If the constants are already defined, remove them first before setting again
Configuration menu - View commit details
-
Copy full SHA for 2dae5f0 - Browse repository at this point
Copy the full SHA 2dae5f0View commit details -
Add webrick as a development dependency
Otherwise Rails doesn't find a server for a test app in development mode.
Configuration menu - View commit details
-
Copy full SHA for 4521b85 - Browse repository at this point
Copy the full SHA 4521b85View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8a6fc95 - Browse repository at this point
Copy the full SHA 8a6fc95View commit details
Commits on Mar 31, 2022
-
Configuration menu - View commit details
-
Copy full SHA for fe571c5 - Browse repository at this point
Copy the full SHA fe571c5View commit details
Commits on Jul 6, 2024
-
Convert project to GitHub Actions
- Drops end-of-life'd versions of rails: 5.2 and 6.0, and ruby 3.0 - Tests with current versions of Rails: 6.1, 7.0, 7.1 - Mark 3 tests as pending to the open bug on deleted models
Configuration menu - View commit details
-
Copy full SHA for 08e65bd - Browse repository at this point
Copy the full SHA 08e65bdView commit details
There are no files selected for viewing
This file was deleted.