Skip to content

Commit 3e089df

Browse files
authored
send tracking parameters with lead creation (#1254)
* send tracking parameters with lead creation * remove lastmodby * update docker ruby version * remove limits on updating leads * use the url for the environment in tracking params * upgrading deprecations and rails security fixes * re-add mini_racer * remove net-http (uri gem issue) * update openstax packages * spec todo + rack-contrib bump * remove where clause from user query
1 parent 3810feb commit 3e089df

File tree

6 files changed

+135
-111
lines changed

6 files changed

+135
-111
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.6.3
1+
FROM ruby:2.7.4
22

33
WORKDIR /code
44

Gemfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git_source(:github) do |repo_name|
66
end
77

88
# Rails framework
9-
gem 'rails', '5.2.4.4'
9+
gem 'rails', '~> 5.2'
1010
gem 'rails-i18n', '~> 5'
1111

1212
# Reduces boot times through caching; required in config/boot.rb
@@ -44,7 +44,6 @@ gem 'compass-rails', '~> 3.1.0'
4444
gem 'coffee-rails', '5.0.0'
4545

4646
# JavaScript asset compiler
47-
# 0.4.0 crashes during our build, fixed in 0.5.0 (upgrade when it's out)
4847
gem 'mini_racer'
4948

5049
# JavaScript asset compressor
@@ -61,7 +60,7 @@ gem 'bcrypt', '~> 3.1.7'
6160
gem 'doorkeeper', '~> 5.1.0'
6261

6362
# OAuth clients
64-
gem 'omniauth'
63+
gem 'omniauth', '~> 1.9'
6564
gem 'omniauth-identity'
6665
gem 'omniauth-facebook'
6766
gem 'omniauth-twitter'
@@ -181,8 +180,12 @@ gem 'oj_mimic_json'
181180
# CORS for local testing/dev
182181
gem 'rack-cors'
183182

183+
# Data visualization and query
184184
gem 'blazer'
185185

186+
# temp fix until we update old dependencies
187+
# gem "net-http"
188+
186189
group :development, :test do
187190
# Run specs in parallel
188191
gem 'parallel_tests'
@@ -234,9 +237,9 @@ group :development, :test do
234237
# Lint RSpec files
235238
gem 'rubocop-rspec'
236239

237-
gem 'faraday', '~> 1.0.0'
240+
gem 'faraday'
238241

239-
gem 'faraday_middleware', '~> 1.0.0'
242+
gem 'faraday_middleware'
240243
end
241244

242245
group :development do

0 commit comments

Comments
 (0)