Merge branch 'assets-refactoring' into dev

Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/index.html.haml

app/assets/javascripts/application.js

@@ -5,11 +5,14 @@
 // the compiled file.
 //
 //= require jquery
+//= require jquery-ui
 //= require jquery_ujs
+//= require jquery.ui.selectmenu
+//= require jquery.cookie
 //= require_tree .
 
 $(function(){
-  $(".one_click_select").click(function(){
+  $(".one_click_select").live("click", function(){
     $(this).select();
   });
 

app/assets/stylesheets/application.css

@@ -2,6 +2,8 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require jquery-ui/jquery-ui
+ *= require jquery-ui/jquery.ui.selectmenu
  *= require_self
  *= require_tree .
 */

app/assets/stylesheets/highlight.css.scss

@@ -53,7 +53,6 @@ table.highlighttable pre{
   text-align:left;
 }
 
-
 .git-empty .highlight {
   @include round-borders-all(4px);
   background:#eee;
@@ -74,7 +73,6 @@ table.highlighttable pre{
   box-shadow:0 5px 15px #000;
 }
 
-
 .hll { background-color: #ffffff }
 .c { color: #888888; font-style: italic } /* Comment */
 .err { color: #a61717; background-color: #e3d2d2 } /* Error */

app/assets/stylesheets/projects.css.scss

@@ -157,7 +157,6 @@ table.round-borders {
   background: transparent 9 !important;
 }
 
-
 #header-panel {
   @include panel-color;
   height:40px;
@@ -230,7 +229,6 @@ a {
   }
 }
 
-
 .view_file_content{
   .old_line, .new_line {
     background:#ECECEC;
@@ -281,8 +279,6 @@ input.ssh_project_url {
   text-align:center;
 }
 
-
-
 .day-commits-table li.commit {
   cursor:pointer;
 
@@ -599,7 +595,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
     }
   }
 
-
   span{
     border: 1px solid #aaa;
     color:black;

app/controllers/issues_controller.rb

@@ -57,7 +57,6 @@ class IssuesController < ApplicationController
     end
   end
 
-
   def destroy
     return access_denied! unless can?(current_user, :admin_issue, @issue)
 

app/controllers/notes_controller.rb

@@ -15,7 +15,6 @@ class NotesController < ApplicationController
       notify if params[:notify] == '1'
     end
 
-
     respond_to do |format|
       format.html {redirect_to :back}
       format.js

app/models/snippet.rb

@@ -22,7 +22,6 @@ class Snippet < ActiveRecord::Base
             :presence => true,
             :length   => { :within => 0..10000 }
 
-
   def self.content_types
     [
       ".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",

app/views/admin/mailer/preview.html.haml

@@ -23,7 +23,6 @@
   %div
     %iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
 
-
 :javascript
   $(function() {
       $( "#accordion" ).accordion(); });

app/views/admin/team_members/show.html.haml

@@ -11,7 +11,6 @@
     %b Since:
     = @admin_team_member.updated_at
 
-
 .span-10
   .span-6
     %b Access:

app/views/admin/users/new.html.haml

@@ -2,5 +2,4 @@
 
 = render 'form'
 
-
 = link_to 'Back', admin_users_path, :class => "right lbutton"

app/views/admin/users/show.html.haml

@@ -24,7 +24,6 @@
     %b Twitter:
     = @admin_user.twitter
 
-
   .clear
   = link_to 'Edit', edit_admin_user_path(@admin_user)
   \|

app/views/issues/show.html.haml

@@ -39,6 +39,5 @@
         - else
           = check_box_tag "closed", 1, @issue.closed, :disabled => true
 
-
 .clear
 

app/views/layouts/_head_panel.html.erb

@@ -22,7 +22,6 @@
   </div>
 </div>
 
-
 <% if current_user %>
   <%= javascript_tag do %>
     $(function() {

app/views/notes/_notes.html.haml

@@ -20,7 +20,6 @@
     $("#submit_note").removeAttr("disabled");
   })
 
-
 - if ["issues", "projects"].include?(controller.controller_name)
   :javascript
     $(function(){

app/views/team_members/show.html.haml

@@ -25,4 +25,3 @@
     %b Twitter:
     = user.twitter
 
-

config/environments/production.rb

@@ -58,7 +58,6 @@ Gitlab::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
-
   config.action_mailer.delivery_method = :sendmail
   # Defaults to:
   # # config.action_mailer.sendmail_settings = {

db/migrate/20110913200833_devise_create_users.rb

@@ -11,7 +11,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
       # t.token_authenticatable
 
-
       t.timestamps
     end
 

public/index.html.example

@@ -25,7 +25,6 @@
         text-decoration: none;
       }
 
-
       #page {
         background-color: #f0f0f0;
         width: 750px;
@@ -57,7 +56,6 @@
         padding-right: 30px;
       }
 
-
       #header {
         background-image: url("/assets/rails.png");
         background-repeat: no-repeat;
@@ -71,7 +69,6 @@
         font-size: 16px;
       }
 
-
       #about h3 {
         margin: 0;
         margin-bottom: 10px;
@@ -112,7 +109,6 @@
         padding: 10px;
       }
 
-
       #getting-started {
         border-top: 1px solid #ccc;
         margin-top: 25px;
@@ -149,7 +145,6 @@
         font-size: 13px;
       }
 
-
       #sidebar ul {
         margin-left: 0;
         padding-left: 0;

spec/requests/profile_spec.rb

@@ -29,7 +29,6 @@ describe "Profile" do
     it { @user.twitter.should == 'testtwitter' }
   end
 
-
   describe "Password update" do
     before do
       visit profile_password_path