Merge remote-tracking branch 'origin/public' into new-features

jazzido · Mar 23, 2018 · 6cc8ab2 · 6cc8ab2
2 parents 18bc68e + d314309
commit 6cc8ab2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/lib/mondrian_rest/query_helper.rb b/lib/mondrian_rest/query_helper.rb
@@ -136,7 +136,6 @@ def parse_drilldown(cube, drilldown)
 
     def parse_measure_filter(cube, filter)
       m = VALID_FILTER_RE.match(filter)
-
       error!("Filter clause #{filter} is invalid", 400) if m.nil?
 
       unless cube.valid_measure?(m['measure'].strip)

diff --git a/mondrian-rest.gemspec b/mondrian-rest.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mondrian-olap', ["~> 0.8.0"]
   s.add_runtime_dependency 'grape', '~> 1.0', '>= 1.0.0'
   s.add_runtime_dependency 'writeexcel', '~> 1.0', '>= 1.0.5'
-  s.add_runtime_dependency 'activesupport', ["~> 5.1.5"]
+  s.add_runtime_dependency 'activesupport', '~> 5.1', '>= 5.1.5'
 
   s.add_development_dependency "jar-dependencies", "~> 0.3.2"
   s.add_development_dependency 'rake', '~> 12.1', '>= 12.1.0'

diff --git a/spec/api_spec.rb b/spec/api_spec.rb
@@ -80,6 +80,7 @@ def app
     it "should return the members of a dimension level along with their children" do
       get '/cubes/Sales/dimensions/Store/levels/Store%20City/members?children=true'
       res = JSON.parse(last_response.body)
+
       # TODO add assertions
     end