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.

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

Upgrade to ruby 2.7.6 #865

Merged
merged 27 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3584329
Bump active_enum from `949849e` to `5cbcf17`
dependabot[bot] Sep 3, 2021
ca39ee1
Bump will_paginate from 3.3.0 to 3.3.1
dependabot[bot] Sep 3, 2021
f50887c
Update ruby to 2.7.4
caustt Sep 23, 2021
bffa113
changed alumni mailers to Sandra
SanJSp Sep 27, 2021
f03555d
Bump nokogiri from 1.12.4 to 1.12.5
dependabot[bot] Sep 27, 2021
1699283
Merge pull request #820 from openHPI/dependabot/bundler/nokogiri-1.12.5
SanJSp Oct 4, 2021
6c32d69
Bump tinymce-rails from 5.6.2.1 to 5.10.2
dependabot[bot] Nov 17, 2021
1984949
Bump web-console from 4.1.0 to 4.2.0
dependabot[bot] Nov 18, 2021
356a43b
implements return off all staff members on employer export
SanJSp Jan 6, 2022
8250455
Merge pull request #835 from openHPI/dependabot/bundler/web-console-4…
SanJSp Jan 6, 2022
d4fa806
Merge pull request #834 from openHPI/dependabot/bundler/tinymce-rails…
SanJSp Jan 6, 2022
0b012ee
Merge pull request #814 from openHPI/dependabot/bundler/active_enum-5…
SanJSp Jan 6, 2022
29c5dc6
expanded employer export with creation and last update timestamps
SanJSp Jan 12, 2022
ff0aa57
fixed tests for expanded employer export with creation and last updat…
SanJSp Jan 12, 2022
8f54ffb
Revert "Bump tinymce-rails from 5.6.2.1 to 5.10.2"
SanJSp Jan 31, 2022
dba6d48
Merge pull request #846 from openHPI/revert-834-dependabot/bundler/ti…
SanJSp Jan 31, 2022
420efdd
Bump nokogiri from 1.12.5 to 1.13.3
dependabot[bot] Feb 26, 2022
defbd12
Merge pull request #849 from openHPI/dependabot/bundler/nokogiri-1.13.3
SanJSp Mar 1, 2022
93df0e1
updated rails to 6.1.4.6 from 6.1.4.1
SanJSp Mar 1, 2022
60bc92a
remove padding so that delete button always shows
SanJSp Apr 4, 2022
a6be561
Bump nokogiri from 1.13.3 to 1.13.4 (#855)
dependabot[bot] Apr 12, 2022
88a77da
Merge branch 'newsletter_delete_button'
SanJSp Apr 21, 2022
09b7d04
updated rails version to 6.1.4.7
SanJSp Apr 21, 2022
dc42a90
Upgrade to ruby 2.7.6
Dome-GER May 11, 2022
878bb3a
Upgrade rubocop gem
Dome-GER May 11, 2022
e055446
Drop outdated rake task
Dome-GER May 11, 2022
4c594d0
Merge branch 'staging' into ds/ruby-2.7.6
SanJSp May 12, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.4
ruby-version: 2.7.6
bundler-cache: true

- name: Setup Databse
Expand All @@ -35,7 +35,7 @@ jobs:
RAILS_ENV: test

- name: Run tests
run: bundle exec rspec --color --format progress --require spec_helper --require rails_helper
env:
RAILS_ENV: test
CC_TEST_REPORTER_ID: true
run: bundle exec rspec --color --format progress --require spec_helper --require rails_helper
3 changes: 2 additions & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
2.7.4
2.7.6

7 changes: 2 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'
ruby '2.7.4'
ruby '2.7.6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.4'
gem 'rails', '~> 6.1.4.7'

# Use postgresql as the database for Active Record
gem 'pg', '~> 1.2.3'
Expand All @@ -16,9 +16,6 @@ gem 'uglifier'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 5.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', '~> 0.12.0', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails', '~> 4.3'

Expand Down
163 changes: 79 additions & 84 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/adzap/active_enum.git
revision: 949849eced0db3b056cde29a8b1a605edbfa7cbb
revision: 5cbcf1787fcadd5d034b540cbb481316f9c29537
specs:
active_enum (1.0.0.rc8)
activesupport (>= 3.0)
Expand All @@ -21,60 +21,60 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.4.1)
actionpack (= 6.1.4.1)
activesupport (= 6.1.4.1)
actioncable (6.1.4.7)
actionpack (= 6.1.4.7)
activesupport (= 6.1.4.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.1)
actionpack (= 6.1.4.1)
activejob (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
actionmailbox (6.1.4.7)
actionpack (= 6.1.4.7)
activejob (= 6.1.4.7)
activerecord (= 6.1.4.7)
activestorage (= 6.1.4.7)
activesupport (= 6.1.4.7)
mail (>= 2.7.1)
actionmailer (6.1.4.1)
actionpack (= 6.1.4.1)
actionview (= 6.1.4.1)
activejob (= 6.1.4.1)
activesupport (= 6.1.4.1)
actionmailer (6.1.4.7)
actionpack (= 6.1.4.7)
actionview (= 6.1.4.7)
activejob (= 6.1.4.7)
activesupport (= 6.1.4.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.4.1)
actionview (= 6.1.4.1)
activesupport (= 6.1.4.1)
actionpack (6.1.4.7)
actionview (= 6.1.4.7)
activesupport (= 6.1.4.7)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.4.1)
actionpack (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
actiontext (6.1.4.7)
actionpack (= 6.1.4.7)
activerecord (= 6.1.4.7)
activestorage (= 6.1.4.7)
activesupport (= 6.1.4.7)
nokogiri (>= 1.8.5)
actionview (6.1.4.1)
activesupport (= 6.1.4.1)
actionview (6.1.4.7)
activesupport (= 6.1.4.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.4.1)
activesupport (= 6.1.4.1)
activejob (6.1.4.7)
activesupport (= 6.1.4.7)
globalid (>= 0.3.6)
activemodel (6.1.4.1)
activesupport (= 6.1.4.1)
activerecord (6.1.4.1)
activemodel (= 6.1.4.1)
activesupport (= 6.1.4.1)
activestorage (6.1.4.1)
actionpack (= 6.1.4.1)
activejob (= 6.1.4.1)
activerecord (= 6.1.4.1)
activesupport (= 6.1.4.1)
activemodel (6.1.4.7)
activesupport (= 6.1.4.7)
activerecord (6.1.4.7)
activemodel (= 6.1.4.7)
activesupport (= 6.1.4.7)
activestorage (6.1.4.7)
actionpack (= 6.1.4.7)
activejob (= 6.1.4.7)
activerecord (= 6.1.4.7)
activesupport (= 6.1.4.7)
marcel (~> 1.0.0)
mini_mime (>= 1.1.0)
activesupport (6.1.4.1)
activesupport (6.1.4.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -127,7 +127,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
configurable_engine (2.0.2)
rails (> 5.2.0)
crass (1.0.6)
Expand Down Expand Up @@ -162,7 +162,7 @@ GEM
ffi (1.14.2)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
globalid (0.5.2)
globalid (1.0.0)
activesupport (>= 5.0)
has_scope (0.8.0)
actionpack (>= 5.2)
Expand All @@ -172,7 +172,7 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.8.10)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
Expand All @@ -192,31 +192,30 @@ GEM
addressable (~> 2.7)
letter_opener (1.7.0)
launchy (~> 2.2)
libv8 (3.16.14.19)
loofah (2.12.0)
loofah (2.16.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
marcel (1.0.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.1.1)
mini_portile2 (2.6.1)
minitest (5.14.4)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.15.0)
multipart-post (2.1.1)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
netrc (0.11.0)
nio4r (2.5.8)
nokogiri (1.12.4)
mini_portile2 (~> 2.6.1)
nokogiri (1.13.4)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4)
Expand All @@ -237,27 +236,27 @@ GEM
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
public_suffix (4.0.6)
racc (1.5.2)
racc (1.6.0)
rack (2.2.3)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.1.4.1)
actioncable (= 6.1.4.1)
actionmailbox (= 6.1.4.1)
actionmailer (= 6.1.4.1)
actionpack (= 6.1.4.1)
actiontext (= 6.1.4.1)
actionview (= 6.1.4.1)
activejob (= 6.1.4.1)
activemodel (= 6.1.4.1)
activerecord (= 6.1.4.1)
activestorage (= 6.1.4.1)
activesupport (= 6.1.4.1)
rails (6.1.4.7)
actioncable (= 6.1.4.7)
actionmailbox (= 6.1.4.7)
actionmailer (= 6.1.4.7)
actionpack (= 6.1.4.7)
actiontext (= 6.1.4.7)
actionview (= 6.1.4.7)
activejob (= 6.1.4.7)
activemodel (= 6.1.4.7)
activerecord (= 6.1.4.7)
activestorage (= 6.1.4.7)
activesupport (= 6.1.4.7)
bundler (>= 1.15.0)
railties (= 6.1.4.1)
railties (= 6.1.4.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -269,17 +268,16 @@ GEM
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rails_serve_static_assets (0.0.5)
railties (6.1.4.1)
actionpack (= 6.1.4.1)
activesupport (= 6.1.4.1)
railties (6.1.4.7)
actionpack (= 6.1.4.7)
activesupport (= 6.1.4.7)
method_source
rake (>= 0.13)
thor (~> 1.0)
rainbow (3.0.0)
raindrops (0.19.1)
rake (13.0.3)
rake (13.0.6)
rdoc (6.3.1)
ref (2.0.0)
regexp_parser (2.1.1)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand All @@ -304,7 +302,7 @@ GEM
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.2)
rubocop (1.11.0)
rubocop (1.13.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
Expand Down Expand Up @@ -349,22 +347,19 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2)
sprockets (4.0.2)
sprockets (4.0.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sshkit (1.21.2)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (1.1.0)
thor (1.2.1)
tilt (2.0.10)
timeliness (0.4.4)
tinymce-rails (5.6.2.1)
Expand All @@ -389,7 +384,7 @@ GEM
raindrops (~> 0.7)
validates_timeliness (5.0.0)
timeliness (>= 0.3.10, < 1)
web-console (4.1.0)
web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
Expand All @@ -399,12 +394,12 @@ GEM
websocket-extensions (0.1.5)
whenever (1.0.0)
chronic (>= 0.6.3)
will_paginate (3.3.0)
will_paginate (3.3.1)
will_paginate-bootstrap (1.0.2)
will_paginate (>= 3.0.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.4.2)
zeitwerk (2.5.4)

PLATFORMS
ruby
Expand Down Expand Up @@ -442,7 +437,7 @@ DEPENDENCIES
paperclip (~> 6.1.0)
pg (~> 1.2.3)
poltergeist
rails (~> 6.1.4)
rails (~> 6.1.4.7)
rails-controller-testing
rails_log_stdout!
rails_serve_static_assets
Expand All @@ -460,7 +455,6 @@ DEPENDENCIES
sentry-raven
simple_form
simplecov
therubyracer (~> 0.12.0)
tinymce-rails (~> 5.6)
tinymce-rails-langs (~> 5.20200505)
traco
Expand All @@ -473,7 +467,8 @@ DEPENDENCIES
will_paginate-bootstrap

RUBY VERSION
ruby 2.7.4p191
ruby 2.7.6p219


BUNDLED WITH
2.1.4
2.3.11
1 change: 0 additions & 1 deletion app/assets/stylesheets/newsletter_orders.css.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#newsletter_delete{
margin-right: 10px;
margin-top: -40px;
margin-bottom: 40px;
}
Loading