diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 64 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | templates/project/assets/fonts/fontawesome-webfont.svg | 2 | ||||
| -rw-r--r-- | templates/project/assets/stylesheets/application.scss | 1 | ||||
| -rw-r--r-- | templates/project/dashboards/layout.erb | 2 | ||||
| -rw-r--r-- | templates/project/jobs/buzzwords.rb | 6 |
8 files changed, 42 insertions, 47 deletions
@@ -1,5 +1,8 @@ *DS_STORE -/Gemfile.lock +history.yml +.*.swp +assets/images/piwik.png +credentials *.gem coverage/ log/ @@ -1,12 +1,4 @@ source 'https://rubygems.org' -gem 'gitlab' -# activesupport >= 5.0.0 requires ruby 2.2 which break jessie support -gem 'activesupport', '< 5.0.0' -# both following gems will break on jessie with -# Gem::InstallError: rest-client requires Ruby version >= 2.0.0. -# even when ruby 2.1 ist installed. So we pin earlier versions: -gem 'mime-types', '2.6.2' -gem 'rest-client', '< 2.0.0' gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 8b92256..9629ed0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,42 +1,42 @@ PATH remote: . specs: - smashing (1.0.0) + dashing (1.3.6) coffee-script (~> 2.2.0) crack execjs (~> 2.0.2) gitlab nagiosharder rack (~> 1.5.4) - rufus-scheduler (~> 3.2.0) + rufus-scheduler (~> 2.0.24) sass (~> 3.2.12) sinatra (~> 1.4.4) sinatra-contrib (~> 1.4.2) sprockets (~> 2.10.1) thin (~> 1.6.1) - thor (~> 0.19) + thor (> 0.18.1) GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.7.1) i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - backports (3.10.0) + backports (3.6.8) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + coffee-script-source (1.10.0) crack (0.4.3) safe_yaml (~> 1.0.0) daemons (1.2.4) docile (1.1.5) - domain_name (0.5.20170404) + domain_name (0.5.20160826) unf (>= 0.0.5, < 1.0.0) - eventmachine (1.2.5) + eventmachine (1.2.0.1) execjs (2.0.2) fakeweb (1.3.0) gitlab (4.2.0) @@ -48,18 +48,18 @@ GEM hike (1.2.3) http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.15.6) + httparty (0.14.0) multi_xml (>= 0.5.2) - i18n (0.9.0) - concurrent-ruby (~> 1.0) + i18n (0.7.0) + json (1.8.3) metaclass (0.0.4) mime-types (2.6.2) - mini_portile2 (2.3.0) + mini_portile2 (2.1.0) minitest (5.2.3) mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.12.2) - multi_xml (0.6.0) + multi_json (1.12.1) + multi_xml (0.5.5) nagiosharder (0.5.0) activesupport hashie (~> 1.2.0) @@ -69,19 +69,22 @@ GEM rest-client terminal-table netrc (0.11.0) - nokogiri (1.8.1) - mini_portile2 (~> 2.3.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) rack (1.5.5) rack-protection (1.5.3) rack - rack-test (0.7.0) - rack (>= 1.0, < 3) + rack-test (0.6.3) + rack (>= 1.0) rake (10.1.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rufus-scheduler (3.2.2) + rufus-scheduler (2.0.24) + tzinfo (>= 0.3.22) safe_yaml (1.0.4) sass (3.2.19) simplecov (0.8.2) @@ -89,7 +92,7 @@ GEM multi_json simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - sinatra (1.4.8) + sinatra (1.4.7) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) @@ -105,38 +108,37 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) thin (1.6.4) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) - thor (0.20.0) - thread_safe (0.3.6) + thor (0.19.1) + thread_safe (0.3.5) tilt (1.4.1) - tzinfo (1.2.3) + tzinfo (1.2.2) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) - unicode-display_width (1.3.0) + unf_ext (0.0.7.2) + unicode-display_width (1.1.1) PLATFORMS ruby DEPENDENCIES activesupport (< 5.0.0) + dashing! fakeweb (~> 1.3.0) gitlab haml (~> 4.0.4) mime-types (= 2.6.2) minitest (~> 5.2.0) mocha (~> 0.14.0) - nagiosharder rake (~> 10.1.0) rest-client (< 2.0.0) simplecov (~> 0.8.2) - smashing! BUNDLED WITH - 1.15.2 + 1.14.6 @@ -1,7 +1,6 @@ # LEAP Dashboard Check out http://shopify.github.com/dashing for more information. - ## Setup Install bundler if required diff --git a/templates/project/assets/fonts/fontawesome-webfont.svg b/templates/project/assets/fonts/fontawesome-webfont.svg index d05688e..8716cac 100644 --- a/templates/project/assets/fonts/fontawesome-webfont.svg +++ b/templates/project/assets/fonts/fontawesome-webfont.svg @@ -652,4 +652,4 @@ <glyph unicode="" horiz-adv-x="1792" /> <glyph unicode="" horiz-adv-x="1792" /> </font> -</defs></svg>
\ No newline at end of file +</defs></svg> diff --git a/templates/project/assets/stylesheets/application.scss b/templates/project/assets/stylesheets/application.scss index ef2af59..fe4fe22 100644 --- a/templates/project/assets/stylesheets/application.scss +++ b/templates/project/assets/stylesheets/application.scss @@ -255,4 +255,3 @@ h3 { .clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; } .clearfix:after { clear: both; } .clearfix { zoom: 1; } - diff --git a/templates/project/dashboards/layout.erb b/templates/project/dashboards/layout.erb index a578f0c..76a1704 100644 --- a/templates/project/dashboards/layout.erb +++ b/templates/project/dashboards/layout.erb @@ -20,7 +20,7 @@ <div id="container"> <%= yield %> </div> - + <% if development? %> <div id="saving-instructions"> <p>Paste the following at the top of <i><%= params[:dashboard] %>.erb</i></p> diff --git a/templates/project/jobs/buzzwords.rb b/templates/project/jobs/buzzwords.rb index 2668d5a..7974dd9 100644 --- a/templates/project/jobs/buzzwords.rb +++ b/templates/project/jobs/buzzwords.rb @@ -1,9 +1,9 @@ -buzzwords = ['Paradigm shift', 'Leverage', 'Pivoting', 'Turn-key', 'Streamlininess', 'Exit strategy', 'Synergy', 'Enterprise', 'Web 2.0'] +buzzwords = ['Paradigm shift', 'Leverage', 'Pivoting', 'Turn-key', 'Streamlininess', 'Exit strategy', 'Synergy', 'Enterprise', 'Web 2.0'] buzzword_counts = Hash.new({ value: 0 }) SCHEDULER.every '2s' do random_buzzword = buzzwords.sample buzzword_counts[random_buzzword] = { label: random_buzzword, value: (buzzword_counts[random_buzzword][:value] + 1) % 30 } - + send_event('buzzwords', { items: buzzword_counts.values }) -end
\ No newline at end of file +end |
