diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 | ||||
| -rw-r--r-- | app/models/project_services/slack_service.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/_head_panel.html.haml | 4 |
7 files changed, 8 insertions, 13 deletions
@@ -167,6 +167,7 @@ gem 'bootstrap-sass', '~> 3.0' gem "font-awesome-rails", '~> 3.2' gem "gemoji", "~> 1.3.0" gem "gon", '~> 5.0.0' +gem 'nprogress-rails' group :development do gem "annotate", "~> 2.6.0.beta2" diff --git a/Gemfile.lock b/Gemfile.lock index de1ef59712e..46540fc7b03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,6 +297,7 @@ GEM net-ssh (>= 1.99.1) net-ssh (2.7.0) nokogiri (1.5.10) + nprogress-rails (0.1.2.3) oauth (0.4.7) oauth2 (0.8.1) faraday (~> 0.8) @@ -621,6 +622,7 @@ DEPENDENCIES minitest (~> 4.7.0) modernizr (= 2.6.2) mysql2 + nprogress-rails omniauth (~> 1.1.3) omniauth-github omniauth-google-oauth2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4a393dbfe81..f69b750bb69 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -29,3 +29,5 @@ //= require_tree . //= require d3 //= require underscore +//= require nprogress +//= require nprogress-turbolinks diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 70e8972d24d..89f6a547ff8 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -41,19 +41,11 @@ window.linkify = (str) -> window.simpleFormat = (str) -> linkify(sanitize(str).replace(/\n/g, '<br />')) -window.startSpinner = -> - $('.turbolink-spinner').fadeIn() - -window.stopSpinner = -> - $('.turbolink-spinner').fadeOut() - window.unbindEvents = -> $(document).unbind('scroll') $(document).off('scroll') -document.addEventListener("page:fetch", startSpinner) document.addEventListener("page:fetch", unbindEvents) -document.addEventListener("page:change", stopSpinner) $ -> # Click a .one_click_select field, select the contents diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 33466714681..4b7103010bb 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -7,6 +7,8 @@ *= require select2 *= require highlightjs.min *= require_self + *= require nprogress + *= require nprogress-bootstrap */ @import "main/variables.scss"; diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb index 27648acf6d0..754fd87db02 100644 --- a/app/models/project_services/slack_service.rb +++ b/app/models/project_services/slack_service.rb @@ -40,7 +40,7 @@ class SlackService < Service [ { type: 'text', name: 'subdomain', placeholder: '' }, { type: 'text', name: 'token', placeholder: '' }, - { type: 'text', name: 'room', placeholder: '' }, + { type: 'text', name: 'room', placeholder: 'Ex. #general' }, ] end diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index 5080a1b7ef6..d8001fd76d7 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -15,10 +15,6 @@ .navbar-collapse.collapse %ul.nav.navbar-nav %li.hidden-sm.hidden-xs - %a - %div.hide.turbolink-spinner - %i.icon-refresh.icon-spin - %li.hidden-sm.hidden-xs = render "layouts/search" %li.visible-sm.visible-xs = link_to search_path, title: "Search", class: 'has_bottom_tooltip', 'data-original-title' => 'Search area' do |