diff --git a/assets/scripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee index 8f24bbd1..34db8467 100644 --- a/assets/scripts/app/helpers/helpers.coffee +++ b/assets/scripts/app/helpers/helpers.coffee @@ -98,7 +98,8 @@ require 'config/emoij' _githubCommitReferenceLink: (reference, current, matched) -> owner = matched.owner || current.owner repo = matched.repo || current.repo - "#{reference}" + url = "#{Travis.Urls.githubCommit("#{owner}/#{repo}", matched.sha)}" + "#{reference}" _normalizeDateString: (string) -> if window.JHW diff --git a/assets/scripts/app/templates/account.hbs b/assets/scripts/app/templates/account.hbs index 675191a8..05e13dd4 100644 --- a/assets/scripts/app/templates/account.hbs +++ b/assets/scripts/app/templates/account.hbs @@ -1,11 +1,10 @@
- {{#if showPrivateReposHint}} - We're only showing your public repositories below. - You can find your private projects on travis-ci.com. - {{/if}} - {{#if showPublicReposHint}} + {{#if config.pro}} We're only showing your private repositories below. You can find your public projects on travis-ci.org. + {{else}} + We're only showing your public repositories below. + You can find your private projects on travis-ci.com. {{/if}}
diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 65995374..d4771fc8 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -19,12 +19,12 @@ Travis.reopen ).property('controller.repo.slug') actions: - statusImages: -> + statusImages: () -> @popupCloseAll() view = Travis.StatusImagesView.create(toolsView: this) Travis.View.currentPopupView = view view.appendTo($('body')) - event.stopPropagation() + return false ReposEmptyView: Travis.View.extend template: (-> @@ -116,14 +116,14 @@ Travis.reopen menu: -> @popupCloseAll() $('#tools .menu').toggleClass('display') - event.stopPropagation() + return false regenerateKeyPopup: -> if @get('canRegenerateKey') @set('active', true) @closeMenu() - @popup(event) - event.stopPropagation() + @popup('regenerate-key-popup') + return false regenerateKey: -> @popupCloseAll() @@ -227,7 +227,13 @@ Travis.reopen codeClimatePopup: -> @popupCloseAll() @popup('code-climate') - event.stopPropagation() if event? + return false + + removeLogPopup: -> + if @get('canRemoveLog') + @set('active', true) + @popup('remove-log-popup') + return false removeLogPopup: -> if @get('canRemoveLog') diff --git a/lib/travis/web/app.rb b/lib/travis/web/app.rb index f440670f..39b5317a 100644 --- a/lib/travis/web/app.rb +++ b/lib/travis/web/app.rb @@ -83,6 +83,8 @@ class Travis::Web::App def response_for(file, options = {}) content = File.read(file) set_config(content, options) if config_needed?(file) + set_title(content) if index?(file) + headers = { 'Content-Length' => content.bytesize.to_s, 'Cache-Control' => cache_control(file), @@ -134,6 +136,11 @@ class Travis::Web::App Rack::Mime.mime_type File.extname(file) end + def set_title(content) + default_title = "Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community" + content.gsub!(/\{\{title\}\}/, ENV['SITE_TITLE'] || default_title) + end + def set_config(string, opts = {}) string.gsub! %r(]*>) do %() diff --git a/public/index.html b/public/index.html index 6316c6f7..673b0ae0 100644 --- a/public/index.html +++ b/public/index.html @@ -17,7 +17,7 @@ -