Skip to content

Commit ed2ea2d

Browse files
committed
Merge branch 'feature/cf-analytics/369' into develop
2 parents 437e2a5 + acbfc71 commit ed2ea2d

6 files changed

Lines changed: 943 additions & 241 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ test/data/ontology_files/repo/**/*
4545
# Ignore jEnv
4646
.java-version
4747

48+
# Ignore Byebug
49+
.byebug_history
50+
4851
# Ignore RubyMine editor files
4952
.idea
5053

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ group :profiling do
7171
end
7272

7373
group :test do
74+
gem 'byebug', '~> 12.0'
7475
gem 'crack', '0.4.5'
7576
gem 'minitest', '~> 5.0'
7677
gem 'minitest-hooks', "~> 1.5"

Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ GEM
121121
bcrypt_pbkdf (1.1.1-arm64-darwin)
122122
bigdecimal (3.2.2)
123123
builder (3.3.0)
124+
byebug (12.0.0)
124125
capistrano (3.19.2)
125126
airbrussh (>= 1.0.0)
126127
i18n
@@ -425,6 +426,7 @@ DEPENDENCIES
425426
activesupport (~> 5)
426427
bcrypt_pbkdf (>= 1.0, < 2.0)
427428
bigdecimal
429+
byebug (~> 12.0)
428430
capistrano (~> 3)
429431
capistrano-bundler
430432
capistrano-locally

config/environments/test.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@
4242
config.goo_redis_port = REDIS_PORT.to_i
4343
config.http_redis_host = REDIS_HTTP_CACHE_HOST.to_s
4444
config.http_redis_port = REDIS_PORT.to_i
45-
config.ontology_analytics_redis_host = REDIS_PERSISTENT_HOST.to_s
46-
config.ontology_analytics_redis_port = REDIS_PORT.to_i
4745
config.search_server_url = SOLR_TERM_SEARCH_URL.to_s
4846
config.property_search_server_url = SOLR_PROP_SEARCH_URL.to_s
4947
#config.enable_notifications = false
48+
49+
# Ontology analytics
50+
config.ontology_analytics_redis_host = REDIS_PERSISTENT_HOST.to_s
51+
config.ontology_analytics_redis_port = REDIS_PORT.to_i
52+
config.ontology_analytics_redis_field = 'test_analytics'
5053
end
5154

5255
Annotator.config do |config|

0 commit comments

Comments
 (0)