Skip to content
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

Update dependencies and fix tests (hopefully) #178

Merged
merged 9 commits into from
Apr 17, 2020
Merged

Update dependencies and fix tests (hopefully) #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2824a14
Update to latest bundler version
36degrees Apr 16, 2020
edf31a3
Update to rubocop-govuk 3.5.0
36degrees Apr 16, 2020
e9144f6
Update obsolete RuboCop configuration
36degrees Apr 16, 2020
a97fe34
Fix linting offenses
36degrees Apr 16, 2020
bc38c65
Update other development dependencies
36degrees Apr 16, 2020
5693519
Update easily-updateable dependencies
36degrees Apr 16, 2020
ea3c0db
Sort dependencies alphabetically
36degrees Apr 16, 2020
fdbeeae
Update client-side dependencies
36degrees Apr 16, 2020
0d8ad81
Document in CHANGELOG.
36degrees Apr 16, 2020
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
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inherit_gem:
rubocop-govuk:
- config/default.yml

Layout/IndentHeredoc:
Layout/HeredocIndentation:
Enabled: false

Naming/HeredocDelimiterNaming:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- [Pull request #178: Update dependencies and fix tests](https://github.com/alphagov/tech-docs-gem/pull/178) – includes updating GOV.UK Frontend to v3.6.0.

## 2.0.11

### Fixes
Expand Down
1 change: 1 addition & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RSpec::Core::RakeTask.new(:spec)

load "jasmine/tasks/jasmine.rake"

desc "Lint Ruby and JavaScript"
task :lint do
sh "rubocop example lib spec Rakefile"
sh "npm run lint --silent"
Expand Down
24 changes: 12 additions & 12 deletions govuk_tech_docs.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@ Gem::Specification.new do |spec|
spec.add_dependency "activesupport"
spec.add_dependency "chronic", "~> 0.10.2"
spec.add_dependency "middleman", "~> 4.0"
spec.add_dependency "middleman-autoprefixer", "~> 2.7.0"
spec.add_dependency "middleman-autoprefixer", "~> 2.10.0"
spec.add_dependency "middleman-compass", ">= 4.0.0"
spec.add_dependency "middleman-livereload"
spec.add_dependency "middleman-sprockets", "~> 4.0.0"
spec.add_dependency "sprockets", "4.0.0.beta10"
spec.add_dependency "sass"
spec.add_dependency "middleman-syntax", "~> 3.0.0"
spec.add_dependency "middleman-search-gds"
spec.add_dependency "middleman-sprockets", "~> 4.0.0"
spec.add_dependency "middleman-syntax", "~> 3.2.0"
spec.add_dependency "nokogiri"
spec.add_dependency "redcarpet", "~> 3.3.2"
spec.add_dependency "openapi3_parser", "~> 0.5.0"
spec.add_dependency "pry"
spec.add_dependency "redcarpet", "~> 3.5.0"
spec.add_dependency "sass"
spec.add_dependency "sprockets", "~> 4.0.0"


spec.add_development_dependency "bundler", "~> 2.0.1"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "capybara", "~> 2.18.0"
spec.add_development_dependency "rubocop-govuk", "~> 1.0.0"
spec.add_development_dependency "jasmine", "~> 3.1.0"
spec.add_development_dependency "rspec", "~> 3.7.0"
spec.add_development_dependency "bundler", "~> 2.1.4"
spec.add_development_dependency "byebug"
spec.add_development_dependency "capybara", "~> 3.32"
spec.add_development_dependency "jasmine", "~> 3.5.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rspec", "~> 3.9.0"
spec.add_development_dependency "rubocop-govuk", "~> 3.5.0"
end
2 changes: 1 addition & 1 deletion lib/govuk_tech_docs/api_reference/api_reference_extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def api(text)
end

else
return text
text
end
else
text
Expand Down
Loading