Merge branch 'master' into discussions

.travis.yml

+language: ruby
 env:
   - DB=postgresql
   - DB=mysql
@@ -8,7 +9,7 @@ branches:
   only:
     - 'master'
 rvm:
-  - 1.9.2
+  - 1.9.3-p327
 services:
   - mysql
   - postgresql

CHANGELOG

+v 4.1.0
+  - Project public mode (only admin can set now)
+  - Public area with unauthorized access
+  - Load dashboard events with ajax
+  - remember dashboard filter in cookies
+  - replace resque with sidekiq
+  - fix routing issues
+  - cleanup rake tasks
+  - fix backup/restore
+  - scss cleanup
+  - show preview for note images 
+  - improved network-graph
+  - get rid of app/roles/
+  - added new classes Team, Repository
+  - Reduce amount of gitolite calls
+  - Ability to add user in all group projects
+  - remove derecated configs
+  - replaced Korolev font with open font
+  - restyled admin/dashboard page
+  - restyled admin/projects page
+
 v 4.0.0
   - Remove project code and path from API. Use id instead
   - Return valid clonable url to repo for web hook

Gemfile

@@ -71,7 +71,6 @@ gem "redcarpet",     "~> 2.2.2"
 gem "github-markup", "~> 0.7.4", require: 'github/markup'
 # Servers
-gem "thin", '~> 1.5.0'
 gem "unicorn", "~> 4.4.0"
 # Issue tags
@@ -111,7 +110,7 @@ group :assets do
   gem "modernizr",        "2.6.2"
   gem "raphael-rails",    git: "https://github.com/gitlabhq/raphael-rails.git"
   gem 'bootstrap-sass',   "2.2.1.1"
-  gem "font-awesome-sass-rails", "~> 2.0.0"
+  gem "font-awesome-sass-rails", "~> 3.0.0"
   gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
 end

Gemfile.lock

@@ -144,7 +144,6 @@ GEM
     colorize (0.5.8)
     connection_pool (1.0.0)
     crack (0.3.1)
-    daemons (1.1.9)
     devise (2.1.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -174,7 +173,7 @@ GEM
       eventmachine (>= 0.12.0)
     ffaker (1.15.0)
     ffi (1.1.5)
-    font-awesome-sass-rails (2.0.0.0)
+    font-awesome-sass-rails (3.0.0.1)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
     foreman (0.60.2)
@@ -381,7 +380,7 @@ GEM
       rspec-mocks (~> 2.12.0)
     rubyntlm (0.1.1)
     rubyzip (0.9.9)
-    sass (3.2.3)
+    sass (3.2.5)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -437,10 +436,6 @@ GEM
     test_after_commit (0.0.1)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thin (1.5.0)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
     timers (1.0.2)
@@ -488,7 +483,7 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   ffaker
-  font-awesome-sass-rails (~> 2.0.0)
+  font-awesome-sass-rails (~> 3.0.0)
   foreman
   gemoji (~> 1.2.1)
   git
@@ -547,7 +542,6 @@ DEPENDENCIES
   stamp
   test_after_commit
   therubyracer
-  thin (~> 1.5.0)
   uglifier (~> 1.3.0)
   unicorn (~> 4.4.0)
   webmock

Procfile

-web: bundle exec rails s -p $PORT
+web: bundle exec unicorn_rails -p $PORT
 worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default

app/assets/javascripts/dashboard.js.coffee

-$ ->
-  dashboardPage()
-
-dashboardPage = ->
+window.dashboardPage = ->
   Pager.init 20, true
   $(".event_filter_link").bind "click", (event) ->
     event.preventDefault()

app/assets/stylesheets/application.scss

@@ -32,6 +32,7 @@
 @import "sections/profile.scss";
 @import "sections/login.scss";
 @import "sections/editor.scss";
+@import "sections/admin.scss";
 @import "highlight/white.scss";
 @import "highlight/dark.scss";

app/assets/stylesheets/common.scss

@@ -371,6 +371,7 @@ li.note {
         font-size: 48px;
         padding: 20px;
         text-align: center;
+        font-weight: normal;
       }
     }
   }
@@ -445,6 +446,19 @@ li.note {
   }
 }
+.warning_message {
+  border-left: 4px solid #ed9;
+  color: #b90;
+  padding: 10px;
+  margin-bottom: 10px;
+  background: #ffffe6;
+  padding-left: 20px;
+
+  &.centered {
+    text-align: center;
+  }
+}
+
 .oauth_select_holder {
   padding: 20px;
   img {

app/assets/stylesheets/gitlab_bootstrap/files.scss

@@ -37,24 +37,6 @@
     background: #fff;
     font-size: 11px;
-    &.wiki {
-      font-size: 13px;
-      code {
-        padding: 0 4px;
-      }
-      padding: 20px;
-
-      h1 { font-size: 26px; line-height: 46px; }
-      h2 { font-size: 22px; line-height: 42px; }
-      h3 { font-size: 20px; line-height: 40px; }
-      h4 { font-size: 18px; line-height: 32px; }
-      h5 { font-size: 16px; line-height: 26px; }
-
-      .white .highlight pre {
-        background: #f5f5f5;
-      }
-    }
-
     &.image_file {
       background: #eee;
       text-align: center;
@@ -64,6 +46,11 @@
       }
     }
+    &.wiki {
+      padding: 20px;
+      font-size: 13px;
+    }
+
     &.blob_file {
     }