Enterprise Update

.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+
+branches:
+  only:
+  - enterprise
+  - master

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-ruby '2.2.3' if ENV['DYNO']
+ruby '2.3.1' if ENV['DYNO']
 
-gem 'rails', '4.2.4'
+gem 'rails', '4.2.6'
 gem 'dotenv-rails', '~> 2.0.0', :require => 'dotenv/rails-now'
 # gem 'pg'
 gem 'sass-rails', '~> 5.0'
@@ -10,15 +10,14 @@ gem 'coffee-rails', '~> 4.1.0'
 # gem 'therubyracer', platforms: :ruby
 gem "ember-cli-rails", '0.1.13', require: nil
 gem 'ember-rails-assets'
-#gem "warden-github-rails" , github: "huboard/warden-github-rails"
-gem 'warden-github'
-# TODO: replace this
-gem 'sinatra_auth_github'
 gem 'rails_12factor', group: :production
 gem 'puma'
 gem 'foreman'
 gem 'sprockets-rails','3.0.0.beta1', :require => 'sprockets/railtie'
 
+# warden
+gem 'warden-github', '1.4.0', github: 'huboard/warden-github'
+
 gem 'jquery-rails'
 gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
@@ -46,6 +45,7 @@ gem 'redcarpet'
 gem 'pdfkit'
 gem 'wkhtmltopdf-heroku'
 gem 'private_pub', '1.0.3'
+gem 'sinatra', :require => nil
 gem 'sidekiq', "~> 3.0"
 
 # BUNDLE_WITHOUT="development:test:saas"

Gemfile.lock

@@ -13,6 +13,15 @@ PATH
     enterprise (0.0.1)
       rails (~> 4.2.0)
 
+GIT
+  remote: git://github.com/huboard/warden-github.git
+  revision: 459903681fa00820065348c27639b9f27db9fa55
+  specs:
+    warden-github (1.4.0)
+      activesupport (> 3.0)
+      octokit (> 2.1.0)
+      warden (> 1.0)
+
 PATH
   remote: vendor/engines/saas
   specs:
@@ -30,42 +39,42 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.2)
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
+    addressable (2.4.0)
     analytics-ruby (2.0.13)
     annotate (2.6.8)
       activerecord (>= 3.2, <= 4.3)
@@ -126,7 +135,7 @@ GEM
       sprockets (>= 2.0)
     ember-rails-assets (0.1.1)
     erubis (2.7.0)
-    ethon (0.8.0)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
     eventmachine (1.0.7)
     excon (0.45.4)
@@ -267,7 +276,7 @@ GEM
     foreman (0.78.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
-    ghee (0.14.19)
+    ghee (0.14.22)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       hashie (~> 3.3.2)
@@ -301,8 +310,8 @@ GEM
     kgio (2.9.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     memcachier (0.0.2)
     meta_request (0.3.4)
       callsite (~> 0.0, >= 0.0.11)
@@ -315,14 +324,14 @@ GEM
     minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.10.3)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    octokit (3.8.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
     pdfkit (0.6.2)
     private_pub (1.0.3)
       faye
@@ -333,8 +342,7 @@ GEM
     pry-byebug (3.2.0)
       byebug (~> 5.0)
       pry (~> 0.10)
-    puma (2.11.1)
-      rack (>= 1.1, < 2.0)
+    puma (3.4.0)
     rack (1.6.4)
     rack-attack (4.2.0)
       rack
@@ -344,16 +352,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -368,9 +376,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
@@ -413,8 +421,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
@@ -425,13 +433,10 @@ GEM
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra_auth_github (1.2.0)
-      sinatra (~> 1.0)
-      warden-github (~> 1.2.0)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
     solid_use_case (2.1.1)
       deterministic (~> 0.6.0)
@@ -468,12 +473,8 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     uuidtools (2.1.5)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
-    warden-github (1.2.0)
-      activesupport (> 3.0)
-      octokit (> 2.1.0)
-      warden (> 1.0)
     websocket-driver (0.5.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -518,7 +519,7 @@ DEPENDENCIES
   pry-byebug
   puma
   rack-attack
-  rails (= 4.2.4)
+  rails (= 4.2.6)
   rails_12factor
   raygun4ruby
   redcarpet
@@ -529,12 +530,12 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   sidekiq (~> 3.0)
-  sinatra_auth_github
+  sinatra
   solid_use_case
   spring
   sprockets-rails (= 3.0.0.beta1)
   stripe-rails
   sucker_punch
   uglifier (>= 1.3.0)
-  warden-github
+  warden-github (= 1.4.0)!
   wkhtmltopdf-heroku

README.md

@@ -2,6 +2,7 @@
 
 [![HuBoard logo](https://raw.github.com/huboard/huboard-web/master/app/assets/images/HuBoardSplash960.png)](https://huboard.com)
 
+[![Build Status](https://travis-ci.org/huboard/huboard-web.svg)](https://travis-ci.org/huboard/huboard-web)
 Check out our [parent repository](https://github.com/huboard/huboard#github-issues-made-awesome) for details!
 
 ## License

app/assets/stylesheets/_buttons.scss

@@ -37,7 +37,14 @@
       left: 10px;
     }
   }
-
+
+  &.hb-octo-button {
+    img {
+      position: relative;
+      right: 7px;
+      bottom: 1px;
+    }
+  }
 }
 
 .hb-button-group {

app/assets/stylesheets/_colors.scss

@@ -2,6 +2,7 @@ $lighterGrey: #CCC;
 $lightGrey: #999;
 $grey: #666;
 $darkGrey: #444;
+$navGrey: #F3F3F3;
 
 $red: red;
 

app/assets/stylesheets/_repos.scss

@@ -24,6 +24,7 @@
       color:rgba(#ee9c49, 0.7);
     }
   }
+
 }
 
 ul.repos, ul.repos li {
@@ -66,4 +67,56 @@ ul.repos li a.btn {
  margin-top:7px;
 }
 
+.repo-list {
+  .label {
+    &.label-success {
+      padding: 4px;
+    }
+    &.label-warning {
+      padding: 4px;
+    }
+    &.label-warning-grey {
+      padding: 4px;
+      background-color: $lightGrey;
+    }
+  }
+
+  .nav-tabs {
+    .disabled {
+      cursor: not-allowed;
+      a {
+        pointer-events: none;
+      }
+    }
+  }
+}
+
+.dashboard--alert {
+  h5 {
+    color: black;
+    i.ui-icon-alert {
+      position: relative;
+      top: 1px;
+      color: #ee9c49;
+    }
+  }
+  &.public-only-hero {
+    position: relative;
+    bottom: 10px;
+    text-align: center;
+  }
 
+  &.public-only-hero:before {
+    content: '';
+    width: 0px; height: 5px;
+    margin: -19px 25px 0px auto;
+    border-bottom: 15px solid rgb(251, 238, 213);
+    border-left: 15px solid transparent;
+    border-right: 15px solid transparent;
+    float: right;
+  }
+  &.alert {
+    display: block;
+    margin-bottom: 0px;
+  }
+}