Merge branch 'master' of github.com:travis-ci/travis-api

Choose remote

Conflicts:
	Gemfile.lock

.travis.yml

@@ -4,7 +4,7 @@ env:
     - RUBY_GC_MALLOC_LIMIT=90000000
     - RUBY_FREE_MIN=200000
 rvm:
-  - 1.9.3
+  - 2.0.0
 before_script:
   - 'RAILS_ENV=test rake db:create db:schema:load --trace'
 notifications:

Gemfile

@@ -1,4 +1,4 @@
-ruby '1.9.3' rescue nil
+ruby '2.0.0'
 
 source 'https://rubygems.org'
 gemspec

Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 00580d7f38d65bc71bcb78eb93bfc53654d4394c
+  revision: a377a86350de3bb6dc7870766c60bde982a91176
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.12)
@@ -53,7 +53,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: e5294f7d1f04243ea7315de27c36f2feeccec5da
+  revision: bd497bc60f75374956be24437dae5cad96374f6b
   specs:
     travis-support (0.0.1)
 
@@ -214,7 +214,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.3.0)
-    redis (3.0.5)
+    redis (3.0.6)
     redis-namespace (1.3.0)
       redis (~> 3.0.0)
     rerun (0.8.1)

lib/travis/api/app.rb

@@ -1,4 +1,7 @@
 require 'travis'
+require 'travis/model'
+require 'travis/support/amqp'
+require 'travis/states_cache'
 require 'backports'
 require 'rack'
 require 'rack/protection'

lib/travis/api/app/endpoint/documentation.rb

@@ -132,7 +132,6 @@ __END__
               <h2><a href="#<%= endpoint['name'] %>"><%= endpoint['name'] %></a></h2>
               <ul>
               <% endpoint['routes'].each  do |route| %>
-                <% next  if route['scope'] == 'hidden' %>
                 <li>
                   <a href="#<%= slug_for(route) %>">
                     <i class="icon-<%= icon_for route['verb'] %>"></i>
@@ -190,7 +189,6 @@ __END__
   <%= docs_for endpoint %>
 <% end  %>
 <% endpoint['routes'].each  do |route| %>
-  <% next  if route['scope'] == 'hidden' %>
   <div class="route" id="<%= slug_for(route) %>">
     <h3><%= route['verb'] %> <%= route['uri'] %></h3>
     <% if  route['scope'] %>

lib/travis/api/app/endpoint/uptime.rb

@@ -3,7 +3,7 @@ require 'travis/api/app'
 class Travis::Api::App
   class Endpoint
     class Uptime < Endpoint
-      get '/', scope: :hidden do
+      get '/' do
         begin
           ActiveRecord::Base.connection.execute('select 1')
           [200, "OK"]

spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'gh'
 require 'multi_json'
 
 require 'travis/api/app'
+require 'travis/testing'
 require 'travis/testing/scenario'
 require 'travis/testing/factories'
 require 'support/matchers'