ocean-rails 1.23.2 → 1.23.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/initializers/api_constants.rb +10 -2
- data/config/initializers/aws_constants.rb +2 -2
- data/lib/ocean/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7009a840625c3403a639004b3d591f04f04fdcfb
|
4
|
+
data.tar.gz: 17df19e372fd6303aedfd062ef34937051422f2c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cec29a7b8c057c56366e0fda5811c3daa5818a48264aa620e9241c4b5474cf7d43846340e1c2c4ecd934372d627c592c3cf1d48648add0695ebe5e0aa2a3e6b8
|
7
|
+
data.tar.gz: 2c7b542b158ef3b9da8da2e5491addbc47093cbed3b4a547d042959918962b659bf7efc753c3bbde9c6d5aa35e888bcd6ca40353651b000849dd32d36d1323b0
|
@@ -6,9 +6,17 @@ if File.exists?(ef)
|
|
6
6
|
|
7
7
|
# This is the tailored file, not under source control.
|
8
8
|
f = File.join(Rails.root, "config/config.yml")
|
9
|
-
|
9
|
+
|
10
|
+
puts
|
11
|
+
puts "--- ef = #{ef}"
|
12
|
+
puts "--- f = #{f}"
|
13
|
+
|
14
|
+
# If the tailored file doesn't exist, and we're running in test mode
|
10
15
|
# (which is the case under TeamCity), use the example file as-is.
|
11
|
-
f = File.exists?(f) && f || Rails.env
|
16
|
+
f = (File.exists?(f) && f) || ((Rails.env == 'test') && ef)
|
17
|
+
|
18
|
+
puts "--- LOADING #{f}"
|
19
|
+
puts
|
12
20
|
|
13
21
|
# If there is a file to process, do so
|
14
22
|
if f
|
@@ -7,9 +7,9 @@ if File.exists?(ef)
|
|
7
7
|
|
8
8
|
# This is the tailored file, not under source control.
|
9
9
|
f = File.join(Rails.root, "config/aws.yml")
|
10
|
-
# If the tailored file doesn't exist, and we're running in
|
10
|
+
# If the tailored file doesn't exist, and we're running in test mode
|
11
11
|
# (which is the case under TeamCity), use the example file as-is.
|
12
|
-
f = File.exists?(f) && f || Rails.env
|
12
|
+
f = (File.exists?(f) && f) || ((Rails.env == 'test') && ef)
|
13
13
|
|
14
14
|
# If there is a file to process, do so
|
15
15
|
if f
|
data/lib/ocean/version.rb
CHANGED