Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
37d1f5c
WIP: Rails 6.1 - disabled rocket_pants
viktorsmari Aug 21, 2021
67db65a
Run rails v6.1 upgrade command
MacTwister Jun 10, 2025
3f61041
Disable ActiveStorage framework
MacTwister Jun 12, 2025
30ea2b9
Remove fetching Wikifactory projects
MacTwister Jun 12, 2025
8432700
Adds missing Ransack allowed columns for Role model
MacTwister Jun 12, 2025
0247db3
Upgrade Ruby to v3.0 !!
MacTwister Jun 16, 2025
72fe70b
Hide ruby/rails versions (obfuscation)
MacTwister Jun 16, 2025
0481c5e
Can upgrade to Node v22
MacTwister Jun 16, 2025
271025b
WIP update api without rocketpants #577
MacTwister Dec 30, 2025
f7edb2d
Update class capitalized to match the Rails autoloading convention
MacTwister Dec 31, 2025
f6fdddb
Fix test helpers to load require packages
MacTwister Dec 31, 2025
4dce002
Passing tests related to lab refree flow
MacTwister Jan 1, 2026
c23ef58
WIP new API entpoints #577
MacTwister Jan 1, 2026
9832b4a
Delete remaining old API (rocket_pants) #577
MacTwister Jan 1, 2026
b32b6e7
Just use all the new defaults (see what breaks)
MacTwister Jan 2, 2026
9ab08ea
Running rails update to sync files with v6.1
MacTwister Jan 2, 2026
a1bf9ed
wip gem
MacTwister Jan 2, 2026
28e81db
Upgrade FontAwesome to latest v6
MacTwister Jan 2, 2026
3e97cb5
Upgrade Workerflow gem
MacTwister Jan 3, 2026
f3d1a77
Upgrading sass library to next available version
MacTwister Jan 3, 2026
44b4fe7
Make header link icons smaller
MacTwister Jan 4, 2026
17c2adf
Ran bundler update for all gems
MacTwister Jan 4, 2026
d931316
Change removed method update_attributes for models
MacTwister Jan 4, 2026
f2c9e04
Remove hardcoded version from mailchimp test
MacTwister Jan 4, 2026
d23ccef
Fix for Ransack to work with taggable in jobs model
MacTwister Jan 5, 2026
f077f96
Merge branch 'master' into rails6
MacTwister Jan 6, 2026
0c167ab
Sets Sentery user only if logged in
MacTwister Jan 6, 2026
8ba785f
Keep existing oauth on api subdomain working
MacTwister Jan 6, 2026
6acff16
Log any calls to legacy api subdomain
MacTwister Jan 6, 2026
f1b41e3
Run tests for jobs and block non admins from editng jobs
MacTwister Jan 7, 2026
f5de3d7
Update Sidekiq version
MacTwister Jan 11, 2026
27dc126
Remove custom Capybara submit over
MacTwister Jan 11, 2026
351c403
Update capybara gem
MacTwister Jan 11, 2026
2dc15ae
Temp disable referee validation in lab test
MacTwister Jan 11, 2026
51da45b
Lets keep the old labs api running for now #577
MacTwister Jan 14, 2026
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 .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16
v22
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.0.7
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm 2.0.0
rvm 3.0.7
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.8-bullseye
FROM ruby:3.0.7-bullseye

# Install essential Linux packages
RUN apt-get update -qq && apt-get install -y \
Expand All @@ -10,7 +10,7 @@ RUN apt-get update -qq && apt-get install -y \
curl

# Install NodeJS
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
&& apt-get install -y nodejs \
&& rm -rf /var/lib/apt/lists/* \
&& /usr/bin/node -v \
Expand All @@ -24,8 +24,6 @@ RUN mkdir -p $APPROOT/tmp/pids

COPY Gemfile Gemfile.lock .ruby-version $APPROOT/

ENV BUNDLER_VERSION=2.4.20
RUN gem install bundler -v 2.4.20
RUN bundle install

#Without yarn we cannot run rake assets:precompile'
Expand Down
41 changes: 15 additions & 26 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,13 @@ ruby File.read(".ruby-version").strip

source 'https://rubygems.org'

gem 'rails','~> 5.2'
gem 'workflow', '~> 2.0'#, github: 'geekq/workflow'
gem 'workflow-activerecord', '>=4.1', '< 6.0'

# Using community gems because official support does not cover Rails 5
# Consider refactor not to use them or find alternatives.
# Gems hindering Rails 6 upgrade:
gem 'rocket_pants', git: 'https://github.com/parse/rocket_pants'

gem 'protected_attributes_continued'
gem 'rails','~> 6.1.0'

#The `content_tag_for` method has been removed from Rails. To continue using it, add the `record_tag_helper` gem to your Gemfile:
gem 'record_tag_helper'

# Other Gem issues:
gem 'font-awesome-sass', '< 5' # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4

gem 'active_model_serializers'
gem 'activeadmin'
gem 'activeadmin', '~> 3.4'
gem 'acts-as-taggable-on'
gem 'ancestry'#, github: 'stefankroes/ancestry'
gem 'authority'#, github: 'nathanl/authority'
Expand All @@ -34,19 +22,21 @@ gem 'countries', '~> 5', require: 'countries/global'
gem 'country_select', '~> 8.0'
gem 'dalli', '~> 3.2.3'
gem 'discourse_api'
gem 'doorkeeper', '~>5.6.0'
gem 'doorkeeper', '~>5.8.0'
gem 'dotenv-rails'
gem 'dragonfly'#, '~> 1.1.1'
gem 'dragonfly-s3_data_store'
gem 'fast_jsonapi' # To support new v2 JSONAPI
gem 'dragonfly', '~> 1.4.0'
gem 'dragonfly-s3_data_store', '~> 1.3.0'
gem 'jsonapi-serializer', '~> 2.2' # To support JSONAPI.org format
gem 'flatpickr'
gem "font-awesome-sass", "~> 6.5" # https://docs.fontawesome.com/v6/web/use-with/ruby-on-rails
gem 'friendly_id'
gem 'groupdate' #used by chartkick
gem 'geocoder'
gem 'gibbon'
gem 'haml-rails'
gem 'hpricot'
gem 'http_accept_language'
gem 'httparty'
gem 'inherited_resources'
gem 'invisible_captcha'
gem 'jbuilder'
Expand All @@ -68,11 +58,11 @@ gem 'redcarpet'
gem 'redis'
gem 'rolify'
gem 'rspec'
gem 'sass-rails'
gem 'coffee-rails', '~> 4.2.0'
gem 'sassc-rails'
gem 'coffee-rails'
gem 'sentry-ruby'
gem 'sentry-rails'
gem 'sidekiq', '< 7'
gem 'sidekiq', '< 8'
gem 'simplecov', :require => false, :group => :test
gem 'simple_form'
gem 'sitemap_generator'
Expand All @@ -82,9 +72,8 @@ gem 'sprockets'
gem 'sprockets-rails'
gem 'stamp'
gem 'timezone'#, '~> 1.0'
gem 'trumbowyg_rails'#, git: 'https://github.com/TikiTDO/trumbowyg_rails.git'
gem 'twitter'
gem 'uglifier'#, '>= 1.3.0'
gem 'workflow-activerecord', '~> 6.0' # https://github.com/geekq/workflow-activerecord

group :doc do
# bundle exec rake doc:rails generates the API under doc/api.
Expand All @@ -94,7 +83,7 @@ end
group :development do
gem 'listen' # explicitd added (when not installing test gems)
gem 'bullet' #, github: 'flyerhzm/bullet'
gem "i18n-tasks", "~> 0.9.33"
gem "i18n-tasks"
gem 'net-ssh'
gem 'web-console'
gem 'rack-mini-profiler'
Expand All @@ -110,15 +99,15 @@ group :test, :development do
end

group :test do
gem 'capybara', '~> 3.36.0'
gem 'capybara', '~> 3.40.0'
gem 'guard-rspec'
gem 'launchy'
gem 'minitest'
gem 'pry'
gem 'pry-rescue'
gem 'pry-stack_explorer'
gem 'rails-controller-testing'
gem 'selenium-webdriver', '~> 3.0'
gem 'selenium-webdriver', '~> 4.0'
gem 'shoulda-matchers'
gem 'test-unit'
gem 'webmock'
Expand Down
Loading