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

This commit is contained in:
Lisa Passing 2015-02-17 11:27:35 +01:00
commit 780edf69c8
4 changed files with 4 additions and 3 deletions

View File

@ -77,7 +77,7 @@ Controller = Ember.ArrayController.extend
searchFor: (phrase) -> searchFor: (phrase) ->
Ember.run.cancel(@searchLater) if @searchLater Ember.run.cancel(@searchLater) if @searchLater
@searchLater = Ember.run.later(this, (-> @searchLater = Ember.run.later(this, (->
@transitionTo('main.search', phrase) @transitionTo('main.search', phrase.replace(/\//g, '%2F'))
), 500) ), 500)
noReposMessage: (-> noReposMessage: (->

View File

@ -14,7 +14,7 @@ Route = MainTabRoute.extend
@controllerFor('repos').addObserver('firstObject', this, 'currentRepoDidChange') @controllerFor('repos').addObserver('firstObject', this, 'currentRepoDidChange')
model: (params) -> model: (params) ->
params.phrase params.phrase.replace(/%2F/g, '/')
deactivate: -> deactivate: ->
@_super.apply(this, arguments) @_super.apply(this, arguments)

View File

@ -8,7 +8,7 @@ View = Ember.View.extend
classRecent: (-> classRecent: (->
if @get('tab') == 'recent' if @get('tab') == 'recent'
'active' 'active'
else if @get('tab') == 'search' && @auth.get('signedIn') else if @get('tab') == 'search' && @get('controller').auth.get('signedIn')
'hidden' 'hidden'
).property('tab') ).property('tab')

View File

@ -47,6 +47,7 @@ module.exports = function(environment) {
sshKey: true, sshKey: true,
caches: true caches: true
}; };
ENV.charmKey = 'gy5gx7dy6dh86hxzkz1wmtvupwvievu';
} }
} }