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

Upgrade to Calagator 2.0 with Rails 5 #56

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+808 −481
Open

Upgrade to Calagator 2.0 with Rails 5 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d89ec76
Update .gitignore
aeschright Oct 29, 2021
0c67315
Upgrade to Calagator 2.0.0 and Rails 5
aeschright Nov 8, 2021
ff93f74
Update ruby version in Dockerfile
reidab Dec 30, 2021
7abe134
Apply suggestions from code review
reidab Dec 30, 2021
70334bb
Update production log level
reidab Dec 30, 2021
ce61068
Re-import migrations from Calagator engine
reidab Dec 31, 2021
7af05d3
Update schema after DB migration import
reidab Dec 31, 2021
0cb73fe
Update CSS + assets from Calagator engine
reidab Dec 31, 2021
8d29fc8
Remove Meetup API key configuration
reidab Dec 31, 2021
2a5c4d6
Bump Ruby version to 2.7.5 + Bundler 2.x
reidab Dec 31, 2021
d35f45c
Remove outdated Facebook parser config
reidab Dec 31, 2021
3f0973c
Bump Calagator to 2.0.0.pre.1
reidab Mar 13, 2022
4598427
Regenerate binstubs
reidab Mar 14, 2022
8827ad7
Ensure tmp structure exists
reidab Mar 14, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
!/log/.keep
/tmp
solr
.DS_Store
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.8
2.7.5
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM ruby:2.5.8
FROM ruby:2.7.5
ARG git_sha
ENV LANG C.UTF-8
RUN apt-get update \
&& apt-get install --no-install-recommends -y libpq-dev postgresql-client sqlite3 libsqlite3-dev libssl-dev nodejs \
&& rm -rf /var/lib/apt/lists/*
RUN gem install bundler -v '< 2' \
&& bundle config --global frozen 1 \
RUN bundle config --global frozen 1 \
&& bundle config github.https true \
&& bundle config set deployment 'true'
COPY Gemfile Gemfile.lock .ruby-version /app/
Expand Down
7 changes: 4 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ source 'https://rubygems.org'
# Fixing deprecated 'last_comment' method in newer versions of rake
gem 'rake', '< 11.0'

gem 'calagator', git: 'https://github.com/calagator/calagator.git'
gem 'calagator', '2.0.0.pre.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.11'
gem 'rails', '~> 5.2'

gem 'rails_12factor', group: :production

Expand Down Expand Up @@ -38,6 +37,8 @@ gem 'progress_bar'

gem "recaptcha", require: "recaptcha/rails"

gem 'paper_trail_manager', github: 'fusion94/paper_trail_manager', ref: 'b8630cd0e3318ad0929b80a701a18175402a4944'

# Performance and error monitoring
gem 'airbrake'
gem 'newrelic_rpm'
Expand Down
Loading