diff options
author | Nathan L Smith <smith@chef.io> | 2016-12-04 23:41:56 -0600 |
---|---|---|
committer | Nathan L Smith <smith@chef.io> | 2016-12-04 23:41:56 -0600 |
commit | 78a11d032d641fda1a4702abc3535b80bb2f0bda (patch) | |
tree | 487d40907b5e0d953a1cc2b1270682d4dde7144e /Gemfile | |
parent | 1c172661f6d6ddf9bf37cda4f7b9651adbc2eb53 (diff) | |
download | chef-zero-78a11d032d641fda1a4702abc3535b80bb2f0bda.tar.gz |
Handle the start and rows parameters correctlynls/SPOOL-436/toomanyrows
Chef Zero would, on a search request using the "start" or "rows"
parameters, always return all rows.
This change makes it so only the correct number of rows are returned or
the results start at the correct index.
This change will make the tests added in oc-chef-pedant in
chef/chef-server#1028 pass.
Also update the Gemfile to use HTTPS URLs for Git sources, remove unused
comments, and use the Chef Gem from RubyGems as the previous comment
suggested.
Signed-off-by: Nathan L Smith <smith@chef.io>
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -1,9 +1,9 @@ source "https://rubygems.org" gemspec -# gem 'rest-client', :github => 'chef/rest-client' +# gem 'rest-client', :git => 'https://github.com/chef/rest-client.git' -gem "oc-chef-pedant", :github => "chef/chef-server" +gem "oc-chef-pedant", :git => "https://github.com/chef/chef-server.git" group :changelog do gem "github_changelog_generator" @@ -13,10 +13,7 @@ group :development, :test do gem "chefstyle", "= 0.3.1" end -# bundler resolve failure on "rspec_junit_formatter" -# gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option" - -gem "chef", github: "chef/chef" # until chef 12.15 is released +gem "chef" if ENV["GEMFILE_MOD"] puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}" |