Merge branch 'master' of gitlab.com:gitlab-com/www-gitlab-com into guidelines

Gemfile

@@ -23,6 +23,8 @@ group :test do
 end
 gem 'sinatra', '~> 1.4.2'
+gem 'yui-compressor', '~> 0.12.0'
+gem 'html_compressor', '~> 0.0.3'
 gem "sinatra-contrib", "~> 1.4.2"
 gem 'redcarpet'
 gem 'recurly', '~> 2.2.1'

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
+    POpen4 (0.1.4)
+      Platform (>= 0.4.0)
+      open4
+    Platform (0.4.0)
     RedCloth (4.2.9)
     addressable (2.3.7)
     backports (3.6.0)
@@ -28,6 +32,8 @@ GEM
       parallel (~> 1.3)
       typhoeus (~> 0.7)
       yell (~> 2.0)
+    html_compressor (0.0.3)
+      POpen4 (>= 0.1.4)
     jekyll (0.12.0)
       classifier (~> 1.3)
       directory_watcher (~> 1.1)
@@ -44,6 +50,7 @@ GEM
     multi_json (1.9.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
+    open4 (1.3.4)
     parallel (1.4.0)
     posix-spawn (0.3.6)
     pygments.rb (0.3.4)
@@ -83,6 +90,7 @@ GEM
       ethon (>= 0.7.1)
     yajl-ruby (1.1.0)
     yell (2.0.5)
+    yui-compressor (0.12.0)
 PLATFORMS
   ruby
@@ -94,6 +102,7 @@ DEPENDENCIES
   directory_watcher (= 1.4.1)
   haml (~> 3.1.7)
   html-proofer
+  html_compressor (~> 0.0.3)
   jekyll (~> 0.12)
   liquid (~> 2.3.0)
   pygments.rb (~> 0.3.4)
@@ -109,3 +118,4 @@ DEPENDENCIES
   sinatra (~> 1.4.2)
   sinatra-contrib (~> 1.4.2)
   stringex (~> 1.4.0)
+  yui-compressor (~> 0.12.0)

Rakefile

+require "yui/compressor"
+require "html_compressor"
 require "rubygems"
 require "bundler/setup"
 require "stringex"
@@ -223,6 +225,9 @@ task :deploy do
     Rake::Task[:generate].execute
   end
+  Rake::Task[:minify_css].execute
+  Rake::Task[:minify_js].execute
+
   Rake::Task[:copydot].invoke(source_dir, public_dir)
   Rake::Task["#{deploy_default}"].execute
 end
@@ -493,3 +498,34 @@ desc "Build and test website"
 task :test => [:clean, :generate] do
   HTML::Proofer.new("./public", htmlproof_options ).run
 end
+
+##########
+# Minify #
+##########
+
+desc "Minify CSS"
+task :minify_css do
+  puts "## Minifying CSS"
+  compressor = YUI::CssCompressor.new
+  Dir.glob("#{public_dir}/**/*.css").each do |name|
+    puts "Minifying #{name}"
+    input = File.read(name)
+    output = File.open("#{name}", "w")
+    output << compressor.compress(input)
+    output.close
+  end
+end
+
+desc "Minify JS"
+task :minify_js do
+  puts "## Minifying JS"
+  compressor = YUI::JavaScriptCompressor.new
+  Dir.glob("#{public_dir}/**/*.js").each do |name|
+    puts "Minifying #{name}"
+    input = File.read(name)
+    output = File.open("#{name}", "w")
+    output << compressor.compress(input)
+    output.close
+  end
+end
+

deploy/deploy.rb

@@ -45,6 +45,20 @@ post '/webhook' do
         abort "Failed to copy the public directory"
       end
+      puts "Minifying JS files: "
+      if system("bundle exec rake minify_js")
+        puts "Done."
+      else
+        abort "Could not minify JS files"
+      end
+
+      puts "Minifying CSS files: "
+      if system("bundle exec rake minify_css")
+        puts "Done."
+      else
+        abort "Could not minify CSS files"
+      end
+
       puts "Copying recurly directory: "
       if system("rsync -r /tmp/site/recurly/ /home/deploy/recurly/")
         puts "Done."

source/disclosure/index.html

@@ -8,6 +8,7 @@ title: Responsible Disclosure Policy
       <div class="col-sm-8 col-md-8 col-sm-offset-2 col-md-offset-2">
         <p>Please email support@gitlab.com to report any security vulnerabilities. Please refrain from requesting compensation for reporting vulnerabilities. We will acknowledge receipt of your vulnerability report and send you regular updates about our progress. If you want we will <a title="Vulnerability Acknowledgements" href="/vulnerability-acknowledgements/">publicly acknowledge</a> your responsible disclosure.</p>
         <p>You are not allowed to search for vulnerabilities on GitLab.com itself. GitLab is open source software, you can install a copy yourself and test against that. There is also a <a href="http://demo.gitlab.com/">demo server</a> to test against. If you want to perform testing that might break things please contact us to arrange access to a staging server.</p>
+        <p>If you want to encode your disclosure please email us to get our PGP key.</p>
       </div>
     </div>
   </div>