clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
This commit is contained in:
parent
f6a67fbad5
commit
d62200cad4
|
@ -725,7 +725,6 @@ $.widget("ui.selectmenu", {
|
||||||
return $(elem).hasClass( this.namespace + '-state-disabled' );
|
return $(elem).hasClass( this.namespace + '-state-disabled' );
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_disableOption: function(index) {
|
_disableOption: function(index) {
|
||||||
var optionElem = this._optionLis.eq(index);
|
var optionElem = this._optionLis.eq(index);
|
||||||
if (optionElem) {
|
if (optionElem) {
|
||||||
|
|
|
@ -53,7 +53,6 @@ table.highlighttable pre{
|
||||||
text-align:left;
|
text-align:left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.git-empty .highlight {
|
.git-empty .highlight {
|
||||||
@include round-borders-all(4px);
|
@include round-borders-all(4px);
|
||||||
background:#eee;
|
background:#eee;
|
||||||
|
@ -74,7 +73,6 @@ table.highlighttable pre{
|
||||||
box-shadow:0 5px 15px #000;
|
box-shadow:0 5px 15px #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.hll { background-color: #ffffff }
|
.hll { background-color: #ffffff }
|
||||||
.c { color: #888888; font-style: italic } /* Comment */
|
.c { color: #888888; font-style: italic } /* Comment */
|
||||||
.err { color: #a61717; background-color: #e3d2d2 } /* Error */
|
.err { color: #a61717; background-color: #e3d2d2 } /* Error */
|
||||||
|
|
|
@ -157,7 +157,6 @@ table.round-borders {
|
||||||
background: transparent 9 !important;
|
background: transparent 9 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#header-panel {
|
#header-panel {
|
||||||
@include panel-color;
|
@include panel-color;
|
||||||
height:40px;
|
height:40px;
|
||||||
|
@ -230,7 +229,6 @@ a {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.view_file_content{
|
.view_file_content{
|
||||||
.old_line, .new_line {
|
.old_line, .new_line {
|
||||||
background:#ECECEC;
|
background:#ECECEC;
|
||||||
|
@ -281,8 +279,6 @@ input.ssh_project_url {
|
||||||
text-align:center;
|
text-align:center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.day-commits-table li.commit {
|
.day-commits-table li.commit {
|
||||||
cursor:pointer;
|
cursor:pointer;
|
||||||
|
|
||||||
|
@ -599,7 +595,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
span{
|
span{
|
||||||
border: 1px solid #aaa;
|
border: 1px solid #aaa;
|
||||||
color:black;
|
color:black;
|
||||||
|
|
|
@ -57,7 +57,6 @@ class IssuesController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
return access_denied! unless can?(current_user, :admin_issue, @issue)
|
return access_denied! unless can?(current_user, :admin_issue, @issue)
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@ class NotesController < ApplicationController
|
||||||
notify if params[:notify] == '1'
|
notify if params[:notify] == '1'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html {redirect_to :back}
|
format.html {redirect_to :back}
|
||||||
format.js
|
format.js
|
||||||
|
|
|
@ -22,7 +22,6 @@ class Snippet < ActiveRecord::Base
|
||||||
:presence => true,
|
:presence => true,
|
||||||
:length => { :within => 0..10000 }
|
:length => { :within => 0..10000 }
|
||||||
|
|
||||||
|
|
||||||
def self.content_types
|
def self.content_types
|
||||||
[
|
[
|
||||||
".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
|
".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
%div
|
%div
|
||||||
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
|
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(function() {
|
$(function() {
|
||||||
$( "#accordion" ).accordion(); });
|
$( "#accordion" ).accordion(); });
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
%b Since:
|
%b Since:
|
||||||
= @admin_team_member.updated_at
|
= @admin_team_member.updated_at
|
||||||
|
|
||||||
|
|
||||||
.span-10
|
.span-10
|
||||||
.span-6
|
.span-6
|
||||||
%b Access:
|
%b Access:
|
||||||
|
|
|
@ -2,5 +2,4 @@
|
||||||
|
|
||||||
= render 'form'
|
= render 'form'
|
||||||
|
|
||||||
|
|
||||||
= link_to 'Back', admin_users_path, :class => "right lbutton"
|
= link_to 'Back', admin_users_path, :class => "right lbutton"
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
%b Twitter:
|
%b Twitter:
|
||||||
= @admin_user.twitter
|
= @admin_user.twitter
|
||||||
|
|
||||||
|
|
||||||
.clear
|
.clear
|
||||||
= link_to 'Edit', edit_admin_user_path(@admin_user)
|
= link_to 'Edit', edit_admin_user_path(@admin_user)
|
||||||
\|
|
\|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
- else
|
- else
|
||||||
= check_box_tag "closed", 1, @issue.closed, :disabled => true
|
= check_box_tag "closed", 1, @issue.closed, :disabled => true
|
||||||
|
|
||||||
|
|
||||||
.clear
|
.clear
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<% if current_user %>
|
<% if current_user %>
|
||||||
<%= javascript_tag do %>
|
<%= javascript_tag do %>
|
||||||
$(function() {
|
$(function() {
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
$("#submit_note").removeAttr("disabled");
|
$("#submit_note").removeAttr("disabled");
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
- if ["issues", "projects"].include?(controller.controller_name)
|
- if ["issues", "projects"].include?(controller.controller_name)
|
||||||
:javascript
|
:javascript
|
||||||
$(function(){
|
$(function(){
|
||||||
|
|
|
@ -25,4 +25,3 @@
|
||||||
%b Twitter:
|
%b Twitter:
|
||||||
= user.twitter
|
= user.twitter
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,6 @@ Gitlab::Application.configure do
|
||||||
# Send deprecation notices to registered listeners
|
# Send deprecation notices to registered listeners
|
||||||
config.active_support.deprecation = :notify
|
config.active_support.deprecation = :notify
|
||||||
|
|
||||||
|
|
||||||
config.action_mailer.delivery_method = :sendmail
|
config.action_mailer.delivery_method = :sendmail
|
||||||
# Defaults to:
|
# Defaults to:
|
||||||
# # config.action_mailer.sendmail_settings = {
|
# # config.action_mailer.sendmail_settings = {
|
||||||
|
|
|
@ -11,7 +11,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
|
||||||
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
|
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
|
||||||
# t.token_authenticatable
|
# t.token_authenticatable
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#page {
|
#page {
|
||||||
background-color: #f0f0f0;
|
background-color: #f0f0f0;
|
||||||
width: 750px;
|
width: 750px;
|
||||||
|
@ -57,7 +56,6 @@
|
||||||
padding-right: 30px;
|
padding-right: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#header {
|
#header {
|
||||||
background-image: url("/assets/rails.png");
|
background-image: url("/assets/rails.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
|
@ -71,7 +69,6 @@
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#about h3 {
|
#about h3 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
@ -112,7 +109,6 @@
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#getting-started {
|
#getting-started {
|
||||||
border-top: 1px solid #ccc;
|
border-top: 1px solid #ccc;
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
|
@ -149,7 +145,6 @@
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#sidebar ul {
|
#sidebar ul {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|
|
@ -29,7 +29,6 @@ describe "Profile" do
|
||||||
it { @user.twitter.should == 'testtwitter' }
|
it { @user.twitter.should == 'testtwitter' }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe "Password update" do
|
describe "Password update" do
|
||||||
before do
|
before do
|
||||||
visit profile_password_path
|
visit profile_password_path
|
||||||
|
|
|
@ -11,7 +11,6 @@ require 'capybara/dsl'
|
||||||
require 'factories'
|
require 'factories'
|
||||||
require 'monkeypatch'
|
require 'monkeypatch'
|
||||||
|
|
||||||
|
|
||||||
# Requires supporting ruby files with custom matchers and macros, etc,
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
||||||
# in spec/support/ and its subdirectories.
|
# in spec/support/ and its subdirectories.
|
||||||
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
||||||
|
|
|
@ -6,7 +6,6 @@ shared_examples_for :project_side_pane do
|
||||||
it { should have_content("Tree") }
|
it { should have_content("Tree") }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
shared_examples_for :tree_view do
|
shared_examples_for :tree_view do
|
||||||
subject { page }
|
subject { page }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue