Skip to content
Browse files

remove heroku specific things

  • Loading branch information...
1 parent 35f5443 commit 300db710b166d5f54c61e383d8876bdea6fa42f3 Steven Davidovitz committed Nov 12, 2012
Showing with 21 additions and 6 deletions.
  1. +1 −0 .travis.yml
  2. +0 −3 Gemfile
  3. +0 −1 Gemfile.lock
  4. +1 −1 Rakefile
  5. +18 −0 Readme.md
  6. +1 −1 lib/zendesk_api/server/base.rb
View
1 .travis.yml
@@ -3,3 +3,4 @@ rvm:
- 1.9.2
- 1.9.3
- jruby
+bundler_args: --without=server console
View
3 Gemfile
@@ -1,8 +1,5 @@
source 'https://rubygems.org'
-gem "bundler", "~> 1.2.0"
-ruby "1.9.3"
-
gem "simplecov", :platforms => :ruby_19, :group => :development
gem "jruby-openssl", :platforms => :jruby
gem "hashie", :git => "git://github.com/intridea/hashie.git"
View
1 Gemfile.lock
@@ -115,7 +115,6 @@ PLATFORMS
DEPENDENCIES
bootstrap-sass
bump
- bundler (~> 1.2.0)
coderay
coderay_bash
compass
View
2 Rakefile
@@ -36,7 +36,7 @@ if defined?(RSpec)
end
desc 'Default: run specs.'
- task :default => ["spec", "spec:server"]
+ task :default => "spec"
end
# extracted from https://github.com/grosser/project_template
View
18 Readme.md
@@ -232,6 +232,9 @@ ticket.save
## Extras
+The following projects are still works in progress and require checking out the repository,
+using ruby 1.9.3, and running `bundle install`.
+
### Zendesk API Test Server
Included in this repository is the code for the [Zendesk API Tester](https://zendesk-api.herokuapp.com/) website.
@@ -240,6 +243,17 @@ Included in this repository is the code for the [Zendesk API Tester](https://zen
bin/zendesk server --help
```
+Additional Dependencies:
+
+* sinatra
+* sinatra-contrib
+* haml
+* compass
+* coderay
+* coderay_bash
+* redcarpet
+* mongoid (and a working MongoDB instance)
+
### Zendesk Console
WIP
@@ -248,6 +262,10 @@ WIP
bin/zendesk console --help
```
+Additional Dependencies:
+
+* ripl
+
## Note on Patches/Pull Requests
1. Fork the project.
2. Make your feature addition or bug fix.
View
2 lib/zendesk_api/server/base.rb
@@ -80,7 +80,7 @@ class App < Sinatra::Base
set_response(@user_request.response) unless @user_request.response.empty?
end
- haml :index, :foramt => :html5
+ haml :index, :format => :html5
end
post '/search' do

0 comments on commit 300db71

Please sign in to comment.
Something went wrong with that request. Please try again.