Skip to content

Commit

Permalink
Application cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dzaporozhets committed Aug 17, 2012
1 parent 4ce034c commit 813814f
Show file tree
Hide file tree
Showing 19 changed files with 755 additions and 1,123 deletions.
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ gem 'settingslogic'
gem "foreman" gem "foreman"
gem "git" gem "git"


# Unused
gem 'tabs_on_rails'
gem "acts_as_list"

group :assets do group :assets do
gem "sass-rails", "3.2.5" gem "sass-rails", "3.2.5"
gem "coffee-rails", "3.2.2" gem "coffee-rails", "3.2.2"
Expand All @@ -91,7 +87,7 @@ group :assets do
gem "jquery-ui-rails", "0.5.0" gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3" gem "modernizr", "2.5.3"
gem "raphael-rails", "1.5.2" gem "raphael-rails", "1.5.2"
gem 'bootstrap-sass', "2.0.3.1" gem 'bootstrap-sass', "2.0.4"
end end


group :development do group :development do
Expand Down
8 changes: 2 additions & 6 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
acts-as-taggable-on (2.3.1) acts-as-taggable-on (2.3.1)
rails (~> 3.0) rails (~> 3.0)
acts_as_list (0.1.6)
addressable (2.2.8) addressable (2.2.8)
ansi (1.4.2) ansi (1.4.2)
arel (3.0.2) arel (3.0.2)
Expand All @@ -109,7 +108,7 @@ GEM
awesome_print (1.0.2) awesome_print (1.0.2)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
blankslate (2.1.2.4) blankslate (2.1.2.4)
bootstrap-sass (2.0.3.1) bootstrap-sass (2.0.4.0)
builder (3.0.0) builder (3.0.0)
capybara (1.1.2) capybara (1.1.2)
mime-types (>= 1.16) mime-types (>= 1.16)
Expand Down Expand Up @@ -338,7 +337,6 @@ GEM
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6) sqlite3 (1.3.6)
stamp (0.1.6) stamp (0.1.6)
tabs_on_rails (2.1.1)
therubyracer (0.10.1) therubyracer (0.10.1)
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thin (1.3.1) thin (1.3.1)
Expand Down Expand Up @@ -375,12 +373,11 @@ PLATFORMS


DEPENDENCIES DEPENDENCIES
acts-as-taggable-on (= 2.3.1) acts-as-taggable-on (= 2.3.1)
acts_as_list
annotate! annotate!
autotest autotest
autotest-rails autotest-rails
awesome_print awesome_print
bootstrap-sass (= 2.0.3.1) bootstrap-sass (= 2.0.4)
capybara capybara
capybara-webkit capybara-webkit
carrierwave carrierwave
Expand Down Expand Up @@ -431,7 +428,6 @@ DEPENDENCIES
six six
sqlite3 sqlite3
stamp stamp
tabs_on_rails
therubyracer therubyracer
thin thin
turn turn
Expand Down
2 changes: 0 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
//= require jquery //= require jquery
//= require jquery.ui.all //= require jquery.ui.all
//= require jquery_ujs //= require jquery_ujs
//= require jquery.ui.selectmenu
//= require jquery.tagify
//= require jquery.cookie //= require jquery.cookie
//= require jquery.endless-scroll //= require jquery.endless-scroll
//= require jquery.highlight //= require jquery.highlight
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/application.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * 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. * the top of the compiled file, but it's generally better to create a new file per style scope.
*= require jquery.ui.all *= require jquery.ui.all
*= require jquery-ui/jquery.ui.selectmenu *= require jquery.ui.aristo
*= require jquery-ui/jquery.tagify
*= require chosen *= require chosen
*= require_self *= require_self
*= require main *= require main
Expand Down
33 changes: 0 additions & 33 deletions app/assets/stylesheets/jquery_ui.scss

This file was deleted.

30 changes: 12 additions & 18 deletions app/assets/stylesheets/main.scss
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@


/** GITLAB colors **/ /** GITLAB colors **/
$text_color:#222; $text_color:#222;
$lite_text_color: #666; $lite_text_color: #666;
$link_color:#2A79A3; $link_color:#2A79A3;
$active_link_color:#2FA0BB; $active_link_color:#2FA0BB;
$active_bg_color:#79C3E0; $active_bg_color:#79C3E0;
$active_bd_color: #2FA0BB; $active_bd_color: #2FA0BB;
Expand All @@ -31,7 +31,7 @@ $hover: #FDF5D9;
box-shadow: 0 0 3px #ddd; box-shadow: 0 0 3px #ddd;
} }


@mixin solid_shade { @mixin solid_shade {
-moz-box-shadow: 0 0 0 3px #eee; -moz-box-shadow: 0 0 0 3px #eee;
-webkit-box-shadow: 0 0 0 3px #eee; -webkit-box-shadow: 0 0 0 3px #eee;
box-shadow: 0 0 0 3px #eee; box-shadow: 0 0 0 3px #eee;
Expand Down Expand Up @@ -73,21 +73,21 @@ $hover: #FDF5D9;




/** /**
* Header of application. * Header of application.
* Contain application logo, search panel, profile icon * Contain application logo, search panel, profile icon
*/ */
@import "sections/header.scss"; @import "sections/header.scss";


/** /**
* Navigation menu of application. * Navigation menu of application.
* Panel with links to pages depends on project, profile or admin area * Panel with links to pages depends on project, profile or admin area
*/ */
@import "sections/nav.scss"; @import "sections/nav.scss";


/** /**
* This file represent some UI that can be changed * This file represent some UI that can be changed
* during web app restyle or theme select. * during web app restyle or theme select.
* *
* Next items should be placed there * Next items should be placed there
* - link, button colors * - link, button colors
* - header restyles * - header restyles
Expand Down Expand Up @@ -118,7 +118,7 @@ $hover: #FDF5D9;
* Most of application styles placed here. * Most of application styles placed here.
* This file represent common UI that should not be changed between themes * This file represent common UI that should not be changed between themes
* or project restyling like form width or user avatar class or commit title * or project restyling like form width or user avatar class or commit title
* *
* TODO: clean it * TODO: clean it
*/ */
@import "common.scss"; @import "common.scss";
Expand All @@ -140,17 +140,17 @@ $hover: #FDF5D9;
@import "ref_select.scss"; @import "ref_select.scss";


/** /**
* Code (files list) styles. Browsing project files there * Code (files list) styles. Browsing project files there
*/ */
@import "sections/tree.scss"; @import "sections/tree.scss";


/** /**
* This file represent notes(comments) styles * This file represent notes(comments) styles
*/ */
@import "sections/notes.scss"; @import "sections/notes.scss";


/** /**
* Devise styles * Devise styles
*/ */
@import "sections/login.scss"; @import "sections/login.scss";


Expand All @@ -165,9 +165,3 @@ $hover: #FDF5D9;
* *
*/ */
@import "highlight/dark.scss"; @import "highlight/dark.scss";

/**
* JQUERY UI ext
*
*/
@import "jquery_ui.scss";
2 changes: 0 additions & 2 deletions app/models/issue.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ class Issue < ActiveRecord::Base
validates :description, validates :description,
length: { within: 0..2000 } length: { within: 0..2000 }


acts_as_list

def self.open_for(user) def self.open_for(user)
opened.assigned(user) opened.assigned(user)
end end
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/dev/tests.rake
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace :dev do
task :tests do task :tests do
["cucumber", "rspec spec"].each do |cmd| ["cucumber", "rspec spec"].each do |cmd|
puts "Starting to run #{cmd}..." puts "Starting to run #{cmd}..."
system("bundle exec #{cmd}") system("export DISPLAY=:99.0 && bundle exec #{cmd}")
raise "#{cmd} failed!" unless $?.exitstatus == 0 raise "#{cmd} failed!" unless $?.exitstatus == 0
end end
end end
Expand Down
Binary file added vendor/assets/images/bg_fallback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vendor/assets/images/icon_sprite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vendor/assets/images/progress_bar.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vendor/assets/images/slider_handles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vendor/assets/images/ui-icons_222222_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vendor/assets/images/ui-icons_454545_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
143 changes: 0 additions & 143 deletions vendor/assets/javascripts/jquery.tagify.js

This file was deleted.

Loading

0 comments on commit 813814f

Please sign in to comment.