summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adding back logic to delete the association request when adding a user to an ...tball/add_user_to_orgtyler-ball2015-08-193-16/+37
* Merge pull request #155 from andrewjamesbrown/server-api-versionTyler Ball2015-08-196-5/+56
|\
| * Use new json_response API for /server_api_versionAndrew Brown2015-08-143-6/+8
| * Further support for /server_api_versionAndrew Brown2015-08-133-5/+36
| * Initial support for /server_api_versionAndrew Brown2015-08-133-0/+18
* | Add Travis and gem version badges.Chris Doherty2015-08-151-1/+6
|/
* Merge pull request #117 from chef/mp/merge-pedantsTyler Ball2015-08-1224-311/+129
|\
| * Merge pull request #152 from andrewjamesbrown/andrewjamesbrown/gemspecsTyler Ball2015-08-123-1/+33
| |\
| | * Preliminary support for _identifiers APIAndrew Brown2015-08-122-0/+24
| | * Disable CS12 pedant flagsAndrew Brown2015-08-121-1/+9
| * | Merge pull request #151 from andrewjamesbrown/andrewjamesbrown/gemspecsmp/merge-pedantsTyler Ball2015-08-112-3/+4
| |\ \ | | |/
| | * Switch to pedant in chef-server repoAndrew Brown2015-08-052-3/+4
| |/
| * Bumping dependency to chef 12.4.1Andrew Brown2015-07-101-1/+1
| * Support POST /organizations/ORGNAME/usersAndrew Brown2015-07-103-15/+39
| * Update gem dependenciesAndrew Brown2015-07-104-6/+6
| * Set oc-chef-pedant to the 2.0.0 tagged release, remove WIP commentMarc Paradise2015-07-101-3/+1
| * Force complete deletion of org on DELETE requestMarc Paradise2015-07-101-1/+1
| * remove multitenant from pedant config, no longer validMarc Paradise2015-07-101-3/+0
| * update oc-chef-pedant gemfile and remove chef-pedant gemfileMarc Paradise2015-07-102-8/+1
| * use the supplied org_type in org creationMarc Paradise2015-07-101-1/+1
| * cleanup a TODO left behind and clean up some debug codeMarc Paradise2015-07-102-3/+0
| * integrate oc-chef-pedant 2.0 for cs12, drop chef-pedant supportMarc Paradise2015-07-108-239/+14
| * update chef-zero to be fully compatible with CS12Marc Paradise2015-07-108-39/+40
|/
* Bump revision to 4.2.3v4.2.3John Keiser2015-06-192-1/+5
* Fix variable error causing when_the_chef_server issuesJohn Keiser2015-06-191-2/+2
* Make server_scope: :context work againjk/server_scope_fixJohn Keiser2015-06-191-19/+21
* Update version and changelog for 4.2.2v4.2.2release-4.2.2danielsdeleo2015-05-182-2/+4
* Access server opts in example context not describe contextdanielsdeleo2015-05-181-5/+7
* Merge pull request #131 from chef/tball/socketlessTyler Ball2015-05-063-0/+18
|\
| * Adding 'server_on_port' method to socketless server maptball/socketlesstyler-ball2015-05-063-0/+18
|/
* Merge pull request #98 from chef/ignore-ruby-versionTyler Ball2015-05-061-0/+1
|\
| * ignore .ruby-versionignore-ruby-versionJosh Black2015-01-301-0/+1
* | Prep for releasing 4.2.1v4.2.1tyler-ball2015-04-072-1/+6
* | Merge pull request #125 from chef/jk/chef_server_optionsTyler Ball2015-04-071-4/+5
|\ \
| * | Don't pollute global Chef server optionsjk/chef_server_optionsJohn Keiser2015-04-061-4/+5
|/ /
* | Updating chef dependency to latest released versionv4.2.0tyler-ball2015-04-061-3/+3
* | Updating changelog and version for 4.2.0 releasetyler-ball2015-04-062-2/+10
* | Merge pull request #119 from chef/jk/org_and_scopeTyler Ball2015-04-061-222/+225
|\ \
| * | Add :organization and :data_scope options to with_chef_serverjk/org_and_scopeJohn Keiser2015-03-191-222/+225
* | | Merge pull request #124 from chef/lcg/bump-ffi-yajlLamont Granquist2015-04-021-1/+1
|\ \ \
| * | | bump ffi-yajl depLamont Granquist2015-04-021-1/+1
|/ / /
* | | Bump to 4.1.0 to release socketless modev4.1.0danielsdeleo2015-04-011-1/+1
* | | Add socketless to CHANGELOGdanielsdeleo2015-04-011-1/+3
* | | Merge branch 'socketless'danielsdeleo2015-04-014-3/+180
|\ \ \
| * | | Extract socketless server map and add specssocketlessdanielsdeleo2015-03-303-47/+156
| * | | Initial implementation of socketless requestsdanielsdeleo2015-03-272-3/+71
|/ / /
* | | Partially Revert 1b2a6e5f107254cce8200a4750035b30265ae0c8partial-revert-1b2a6e5f107254cce8200a4750035b30265ae0c8danielsdeleo2015-03-271-4/+4
* | | Merge pull request #113 from jaymzh/versionTyler Ball2015-03-265-77/+121
|\ \ \ | |/ / |/| |
| * | Support /version; fix some global URIsPhil Dibowitz2015-03-265-77/+121
|/ /
* | repair badges after opscode->chef renameJulian C. Dunn2015-03-011-1/+1