summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that we create the keys pedant needstm/fix_pedant_testsThom May2017-03-081-0/+4
| | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #254 from chef/ssd/no-dep-veilTom Duffield2017-03-062-2/+4
|\ | | | | Remove veil dependency
| * Remove veil dependencySteven Danna2017-03-062-2/+4
|/ | | | Signed-off-by: Steven Danna <steve@chef.io>
* Merge pull request #253 from chef/sr/add-veil-and-pedant-groupThom May2017-03-064-3/+12
|\ | | | | Fix veil + oc-chef-pedant
| * Make pedant read superuser/webui_key from secrets.jsonsr/add-veil-and-pedant-groupStephan Renatus2017-03-063-2/+8
| | | | | | | | | | | | | | The secrets file contains what was used before: stickywicket.pem for both webui_key and superuser_key. Signed-off-by: Stephan Renatus <srenatus@chef.io>
| * Gemfile: add pedant group, including veilStephan Renatus2017-03-061-1/+4
|/ | | | Signed-off-by: Stephan Renatus <srenatus@chef.io>
* update changelog + Rakefile taskLamont Granquist2017-02-022-2/+9
| | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* bumping version to 5.3.0v5.3.0Lamont Granquist2017-02-021-1/+1
| | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Merge pull request #252 from chef/lcg/hashie-bugfixLamont Granquist2017-02-021-1/+1
|\ | | | | change require per hashie author
| * change require per hashie authorLamont Granquist2017-02-021-1/+1
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* update changelogLamont Granquist2017-01-232-153/+32
| | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* bump version to 5.2.0 for releasev5.2.0Lamont Granquist2017-01-231-1/+1
| | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Merge pull request #251 from chef/lcg/favor-metadta-rbLamont Granquist2017-01-231-6/+4
|\ | | | | favor metadata.json over metadata.rb
| * favor metadata.json over metadata.rbLamont Granquist2017-01-231-6/+4
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Merge pull request #233 from chef/tm/support_bang_operatorLamont Granquist2016-12-142-3/+3
|\ | | | | support ! in searches
| * support ! in searchestm/support_bang_operatorThom May2016-08-022-3/+3
| | | | | | | | Signed-off-by: Thom May <thom@may.lt>
* | Merge pull request #249 from chef/5.1.1-releasev5.1.1Scott Christopherson2016-12-142-4/+14
|\ \ | | | | | | Release 5.1.1
| * | Release 5.1.15.1.1-releaseScott Christopherson2016-12-132-4/+14
|/ / | | | | | | Signed-off-by: Scott Christopherson <scott@chef.io>
* | Merge pull request #248 from chef/nls/fix-start-paginationNathan L Smith2016-12-051-21/+13
|\ \ | | | | | | Fix pagination with start parameters
| * | Fix pagination with start parametersnls/fix-start-paginationNathan L Smith2016-12-051-21/+13
|/ / | | | | | | | | | | | | | | | | | | | | This builds on fixes added in #247 and additional tests added in chef/chef-server#1028. Handle the query parameters in the search method instead of the get method to make them more consistent and work properly when start values are given. Signed-off-by: Nathan L Smith <smith@chef.io>
* | Merge pull request #247 from chef/nls/SPOOL-436/toomanyrowsThom May2016-12-052-6/+15
|\ \ | | | | | | Handle the start and rows parameters correctly
| * | Handle the start and rows parameters correctlynls/SPOOL-436/toomanyrowsNathan L Smith2016-12-042-6/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #245 from chef/contribThom May2016-10-045-11/+13
|\ \ | | | | | | Add link to contributing docs and fix chefstyle warnings
| * | Fix a few chefstyle warningscontribTim Smith2016-09-224-11/+9
| | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | Add link to the contributing docsTim Smith2016-09-221-0/+4
|/ / | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #243 from chef/jk/releasev5.1.0John Keiser2016-09-072-3/+10
|\ \ | | | | | | Bump version to 5.1.0
| * | Bump version to 5.1.0jk/releaseJohn Keiser2016-09-072-3/+10
|/ /
* | Merge pull request #242 from chef/lcg/remove-create-additionsThom May2016-09-0640-63/+63
|\ \ | | | | | | Remove create additions flag
| * | remove create additions flaglcg/remove-create-additionsLamont Granquist2016-09-0240-63/+63
|/ / | | | | | | | | | | FFI_Yajl has never implemented this flag Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Revert "remove create additions flag"Lamont Granquist2016-09-0240-63/+63
| | | | | | | | This reverts commit c674dfeacf773579a2eb56cb3c02428268452b50.
* | remove create additions flagLamont Granquist2016-09-0240-63/+63
| | | | | | | | | | | | FFI_Yajl has never implemented this flag Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Merge pull request #240 from chef/mp/SPOOL-340Marc A. Paradise2016-09-013-14/+52
|\ \ | | | | | | store ACEs by client/user
| * | store ACEs by client/usermp/SPOOL-340Marc Paradise2016-08-263-14/+52
|/ / | | | | | | | | | | | | | | | | | | | | Chef Server has the ability to return users and clients separately within an GET ACL request when `detail=granular`. To support that, we need to store them separately and determine if we want to present `actors` or `users` and `clients` at the time of the request. This change makes a reasonable best effort at capturing the creator type (user v client) correctly and uses that for determining its assignment in acls.
* | Merge pull request #238 from chef/jk/bumpv5.0.0John Keiser2016-08-245-15/+23
|\ \ | | | | | | Bump version to 5.0
| * | Bump rack to 2.xJohn Keiser2016-08-241-1/+1
| | |
| * | Remove redundant master chef tests from TravisJohn Keiser2016-08-241-8/+9
| | |
| * | Bump version to 5.0John Keiser2016-08-244-6/+13
|/ /
* | Merge pull request #239 from chef/mp/SPOOL-197Marc A. Paradise2016-08-242-2/+12
|\ \ | | | | | | Support clients and users fields in ACL PUT requests
| * | Support clients and users fields in ACL PUT requestsmp/SPOOL-197Marc Paradise2016-08-232-2/+12
| | |
* | | Merge pull request #237 from chef/jk/ruby22John Keiser2016-08-232-14/+7
|\ \ \ | |/ / |/| | Disable Ruby 2.1, bump dependencies accordingly
| * | Disable Ruby 2.1, bump dependencies accordinglyJohn Keiser2016-08-232-14/+7
|/ /
* | Merge pull request #235 from chef/tm/4_9_0v4.9.0Thom May2016-08-112-3/+11
|\ \ | | | | | | Release 4.9.0
| * | Release 4.9.0tm/4_9_0Thom May2016-08-112-3/+11
|/ / | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | Merge pull request #232 from chef/tm/test_more_rubbiesThom May2016-08-031-11/+25
|\ \ | | | | | | test ruby 2.2 and 2.3
| * | test ruby 2.2 and 2.3tm/test_more_rubbiesThom May2016-08-031-11/+25
| |/ | | | | | | Signed-off-by: Thom May <thom@may.lt>
* | Merge pull request #231 from chef/tm/run_more_pedantThom May2016-08-022-8/+13
|\ \ | |/ |/| Enable policy, cookbook artifacts and ACL pedant tests
| * Enable policy, cookbook artifacts and ACL pedant teststm/run_more_pedantThom May2016-08-021-5/+6
| | | | | | | | Signed-off-by: Thom May <thom@may.lt>
| * Ensure that the cookbook version endpoint doesn't trip over itselfThom May2016-08-011-3/+7
|/ | | | Signed-off-by: Thom May <thom@may.lt>
* Merge pull request #230 from chef/tm/styleThom May2016-07-29116-1321/+1329
|\ | | | | ChefStyle
| * ChefStyletm/styleThom May2016-07-29116-1321/+1329
| | | | | | | | Signed-off-by: Thom May <thom@may.lt>