Skip to content

Commit 3e389df

Browse files
committed
Merge branch 'nz-justice-development' of https://github.com/impactoss/impactoss-server into nz-justice-development
2 parents 5b2cf36 + e798464 commit 3e389df

12 files changed

+326
-222
lines changed

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.2
1+
3.3.0

Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# frozen_string_literal: true
22

33
source "https://rubygems.org"
4-
ruby File.read(File.expand_path(".ruby-version", __dir__)).strip
4+
ruby file: ".ruby-version"
55

66
gem "batch_api"
77
gem "bcrypt", "~> 3.1.7"
88
gem "clockwork"
99
gem "devise"
10-
gem "devise_token_auth"
10+
gem "devise_token_auth", "~> 1.2"
11+
gem "omniauth-azure-activedirectory-v2", "~> 2.1.0"
1112
gem "foundation-rails"
1213
gem "fog-aws"
1314
gem "jquery-rails"

0 commit comments

Comments
 (0)