ocean-rails 2.11.1 → 2.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/config/initializers/ocean_constants.rb +5 -5
- data/lib/ocean/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 46221dda65adcd87c2dc8f09929ec19bc84cc6a0
|
|
4
|
+
data.tar.gz: d679f3ce49157feeac23f36d0f65dedfb0c14bb7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ab2e28bd1f0e49290f5b6d67a889e3a7033b2b457052d1c9102e1ed57e7640129dce5c2d6d6af691adc15ab863a65989caa458f5d52ef180d50870b1e259eec4
|
|
7
|
+
data.tar.gz: 5e003b8a27f6411be5b7da7418d48edf26aae1c7b8fd5fbf766861f8b976ff254e1b83cb3674ed148ee5fe0c33a33b302f4e9bf61647479f321754896d0e7d84
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
# Thus, if you are a frontend developer, you override the string
|
|
17
17
|
# constant here to reflect the Chef environment (master, staging)
|
|
18
18
|
# you wish to run your local tests against by defining the environment
|
|
19
|
-
# variable
|
|
19
|
+
# variable OCEAN_API_HOST.
|
|
20
20
|
#
|
|
21
21
|
# When TeamCity runs its tests, it will set these constants to values
|
|
22
22
|
# appropriate for the Chef environment for which the tests are run.
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
|
|
29
29
|
BASE_DOMAIN = "example.com" unless defined?(BASE_DOMAIN) # For the Rails template generator
|
|
30
30
|
|
|
31
|
-
OCEAN_API_HOST = (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
OCEAN_API_HOST = (ENV['OCEAN_API_HOST'] ||
|
|
32
|
+
(Rails.env == 'test' && "forbidden.#{BASE_DOMAIN}") ||
|
|
33
|
+
"master-api.#{BASE_DOMAIN}"
|
|
34
|
+
).sub("<default>", "master")
|
|
35
35
|
|
|
36
36
|
OCEAN_API_URL = "https://#{OCEAN_API_HOST}"
|
|
37
37
|
|
data/lib/ocean/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ocean-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.11.
|
|
4
|
+
version: 2.11.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Bengtson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-04-
|
|
11
|
+
date: 2014-04-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: typhoeus
|