Skip to content

fix typo, probably introduced by v1 code #3325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martaribeiro merged 3 commits into from
Oct 16, 2023
Merged

fix typo, probably introduced by v1 code #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2d55c6
fix typo, probably introduced by v1 code
nicolasfranck Jul 13, 2023
7d163b0
update CHANGELOG.md as requested by closed PR https://github.com/DMPR…
nicolasfranck Sep 18, 2023
a0980f4
Merge branch 'development' into main
martaribeiro Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# Changelog

## v4.1.1
- Updated fontawesome to V6

### Added
- Added `MORE_INFO` and `LESS_INFO` JS constants (for the Research Outputs feature)
### Fixed
- Updated the default font on the 'Download page' to be 'Roboto, Arial, Sans-Serif'
- Fixed an issue with API V0 that was causing a 500 Internal Server error
- Updated fontawesome to V6


## v4.1.0
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v0/plans_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def index
max_per_page = Rails.configuration.x.application.api_max_page_size
page = params.fetch('page', 1).to_i
per_page = params.fetch('per_page', max_per_page).to_i
per_page = max_per_page if @per_page > max_per_page
per_page = max_per_page if per_page > max_per_page
@args = { per_page: per_page, page: page }
@plans = refine_query(@plans)
respond_with @plans
Expand Down