Merge branch 'master' into ui-improvements

Conflicts:
	assets/scripts/app/controllers/repo.coffee
	assets/scripts/app/templates/builds/show.hbs
	assets/scripts/app/templates/jobs/show.hbs

assets/scripts/app/controllers/builds.coffee

@@ -7,6 +7,7 @@ Travis.BuildsController = Em.ArrayController.extend
   repoBinding: 'controllers.repo.repo'
   tabBinding: 'controllers.repo.tab'
   isLoadedBinding: 'content.isLoaded'
+  isLoadingBinding: 'content.isLoading'
 
   showMore: ->
     id     = @get('repo.id')

assets/scripts/app/models/log.coffee

@@ -15,6 +15,7 @@ require 'travis/chunk_buffer'
 
   fetch: ->
     console.log 'log model: fetching log' if Log.DEBUG
+    @setParts()
     handlers =
       json: (json) => @loadParts(json['log']['parts'])
       text: (text) => @loadText(text)

assets/scripts/app/templates/builds/list.hbs

@@ -45,7 +45,7 @@
           {{#if view.isPullRequestsList}}
             <td>
               <a {{bindAttr href="view.urlGithubPullRequest"}}>
-                #{{commit.pullRequestNumber}}
+                #{{pullRequestNumber}}
               </a>
             </td>
           {{/if}}
@@ -62,6 +62,9 @@
   {{#if displayShowMoreButton}}
     <p>
       {{view view.ShowMoreButton}}
+      {{#if isLoading}}
+        <span class="loading"></span>
+      {{/if}}
     </p>
   {{/if}}
 {{else}}

assets/scripts/app/templates/status_images.hbs

@@ -27,3 +27,7 @@
   <label>{{t repositories.asciidoc}}:</label>
   <input type="text" class="asciidoc" {{bindAttr value="view.asciidocStatusImage"}}></input>
 </p>
+<p>
+  <label>{{t repositories.rst}}:</label>
+  <input type="text" class="rst" {{bindAttr value="view.rstStatusImage"}}></input>
+</p>

assets/scripts/app/views/build.coffee

@@ -11,7 +11,7 @@ Travis.reopen
       tagName: 'button'
       classNameBindings: ['isLoading']
       attributeBindings: ['disabled']
-      isLoadingBinding: 'controller.builds.isLoading'
+      isLoadingBinding: 'controller.isLoading'
       template: Em.Handlebars.compile('{{view.label}}')
 
       disabledBinding: 'isLoading'

assets/scripts/app/views/status_images.coffee

@@ -51,3 +51,7 @@ Travis.StatusImagesView = Em.View.extend
   asciidocStatusImage: (->
     "image:#{@get('statusImageUrl')}[\"Build Status\", link=\"#{@get('urlRepo')}\"]"
   ).property('statusImageUrl')
+
+  rstStatusImage: (->
+    ".. image:: #{@get('statusImageUrl')}   :target: #{@get('urlRepo')}"
+  ).property('statusImageUrl')

assets/styles/app/popup.sass

@@ -44,7 +44,7 @@
 #status-images
   display: none
   width: 600px
-  height: 230px
+  height: 250px
   margin: -95px 0 0 -300px
 
   p

config.ru

@@ -9,7 +9,7 @@ class RedirectSubdomain < Struct.new(:app, :from)
   def call(env)
     request = Rack::Request.new(env)
     if request.host == from
-      [301, { 'Location' => "https://travis-ci.org/#{request.fullpath}", 'Content-Type' => 'text/html' }, []]
+      [301, { 'Location' => "https://travis-ci.org#{request.fullpath}", 'Content-Type' => 'text/html' }, []]
     else
       app.call(env)
     end