Skip to content

Commit b631fa9

Browse files
committed
Merge branch 'master' of github.com:indentlabs/notebook
2 parents 72ccb4a + 2369189 commit b631fa9

33 files changed

+2218
-1323
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Ruby
2020
uses: ruby/setup-ruby@v1
2121
with:
22-
ruby-version: 2.7.4
22+
ruby-version: 3.2
2323
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
2424
- name: Set up Node
2525
uses: actions/setup-node@v1

Gemfile

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,17 @@ gem 'd3-rails', '~> 5.9.2' # used for spider charts
7272
gem 'slack-notifier'
7373
gem 'barnes'
7474

75+
# Profiling / error tracking
76+
gem "stackprof"
77+
gem "sentry-ruby"
78+
gem "sentry-rails"
79+
7580
# Apps
7681
#gem 'easy_translate'
7782
#gem 'levenshtein-ffi'
7883

7984
# Forum
85+
gem "html-pipeline", "~> 2.14" # keep the pre-3.x API that Thredded expects
8086
gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feature/report-posts'
8187
# gem 'thredded', path: "../thredded"
8288

@@ -94,8 +100,8 @@ gem 'word_count_analyzer'
94100
gem 'will_paginate', '~> 4.0'
95101

96102
# Workers
97-
gem 'sidekiq'
98-
gem 'redis'
103+
gem 'sidekiq', '~> 7.3.9'
104+
gem 'redis', '~> 5.1.0'
99105

100106
# Exports
101107
gem 'csv'
@@ -108,7 +114,16 @@ gem 'binding_of_caller' # see has_changelog.rb
108114

109115
group :test, :development do
110116
gem 'pry'
111-
gem 'sqlite3'
117+
gem 'sqlite3', '~> 1.4'
118+
119+
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
120+
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
121+
gem 'dotenv-rails'
122+
gem 'letter_opener_web'
123+
gem 'minitest-reporters', '~> 1.1', require: false
124+
125+
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
126+
gem 'spring'
112127
end
113128

114129
group :production do
@@ -137,22 +152,14 @@ group :development do
137152
gem 'bundler-audit'
138153
end
139154

140-
group :development, :production do
141-
# Profiling / error tracking
142-
gem "stackprof"
143-
gem "sentry-ruby"
144-
gem "sentry-rails"
145-
end
146-
147155
group :worker do
148156
# These gems are only used in workers (and just so happen to slow down app startup
149157
# by quite a bit), so we exclude them from all groups other than RAILS_GROUPS=worker.
150158

151159
# Document understanding
152160
gem 'htmlentities'
153161
gem 'birch', git: 'https://github.com/billthompson/birch.git', branch: 'birch-ruby22'
154-
155-
gem 'engtagger'
162+
gem 'engtagger', github: 'yohasebe/engtagger', ref: 'master' # we might want this in more groups...?
156163
gem 'ibm_watson'
157164
gem 'textstat'
158165
end

0 commit comments

Comments
 (0)