Permalink
Browse files

update from master

  • Loading branch information...
2 parents 6d39e00 + 8c15edf commit c5dfd99e350717f6e40b00185f9bea4909c23693 @orendon orendon committed Oct 13, 2012
View
@@ -13,3 +13,7 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
+
+# Test stuff
+/coverage
+/spec/rspec_report.html
View
@@ -0,0 +1,3 @@
+--colour
+--format progress
+--format html -o "spec/rspec_report.html"
View
@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p194@contrib-hub
+rvm use --create 1.9.3@contrib-hub
View
@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+ - 1.9.2
+ - 1.9.3
+before_install:
+ - gem update --system
+ - gem --version
+env:
+ - RAILS=3.2.8
+script:
+ - RAILS_ENV=test bundle exec rake --trace db:migrate
+ - bundle exec rake db:test:prepare
+ - bundle exec rspec spec/
View
@@ -32,6 +32,10 @@ end
group :development, :test do
gem 'sqlite3'
+
+ gem "rspec-rails", "~> 2.11.0"
+ gem "factory_girl_rails", "~> 4.1.0"
+ gem 'simplecov', :require => false
end
group :production do
View
@@ -37,9 +37,15 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
+ diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
+ factory_girl (4.1.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (4.1.0)
+ factory_girl (~> 4.1.0)
+ railties (>= 3.0.0)
faraday (0.8.4)
multipart-post (~> 1.1)
geocoder (1.1.4)
@@ -117,19 +123,36 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.3)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.11.3)
+ rspec-rails (2.11.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.11.0)
sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.11)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
@@ -142,6 +165,7 @@ PLATFORMS
DEPENDENCIES
coffee-rails (~> 3.2.1)
+ factory_girl_rails (~> 4.1.0)
geocoder
github_api
jquery-rails
@@ -150,6 +174,8 @@ DEPENDENCIES
omniauth-github
pg
rails (= 3.2.8)
+ rspec-rails (~> 2.11.0)
sass-rails (~> 3.2.3)
+ simplecov
sqlite3
uglifier (>= 1.0.3)
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,13 @@
+$(function() {
+ $('.repo-user-description').hide();
+
+ $('.expand-description').click(function() {
+ $(this).parents('li').find(".repo-user-description").toggle('fast')
+ })
+
+ $('.help-button').click(function(e) {
+ var repoName = $(this).attr('data-repo')
+ $.post("/repos/toggle_help", {repo: repoName});
+ e.preventDefault();
+ });
+})
@@ -151,7 +151,6 @@ code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e
pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:20px;}
pre code{padding:0;color:inherit;background-color:transparent;border:0;}
.pre-scrollable{max-height:340px;overflow-y:scroll;}
-form{margin:0 0 20px;}
fieldset{padding:0;margin:0;border:0;}
legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#999999;}
label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;}
@@ -855,18 +854,3 @@ i[class^="icon-"]{opacity:0.8;}
.affix{position:fixed;}
.center-text{text-align:center;}
.btn-home{width:280px;font-size: 30px;margin-top: 25px;}
-#home-botones{margin-top:40px;}
-.nav-li{display:block;}
-#index-subtitle{margin-top: 50px;}
-#button-login-nav{margin-top: 20px;}
-.box-holder{border: 1px solid;padding: 15px 15px 15px 15px;border-radius: 10px;margin-bottom: 30px;background-color: whiteSmoke;box-shadow: 1px 1px 0px black;}
-.no-box-holder{padding: 15px;border-top:1px whiteSmoke solid;}
-.inline{display:inline;}
-.ul-clean{list-style:none;}
-.ul-clean img{margin-right: 5px;}
-.ul-clean li{border-bottom:solid 1px whiteSmoke;margin-bottom: 5px;}
-.border-left{border-left:1px whiteSmoke solid;}
-.margin-top{margin-top: 15px;}
-.help-button {background:url('/assets/help-button.png') no-repeat;cursor:pointer;width: 16px !important;height: 16px;border: none;margin-right: 5px;}
-.no-help-button {background:url('/assets/no-help-button.png') no-repeat;cursor:pointer;width: 16px !important;height: 16px;border: none;margin-right: 5px;}
-.i-help-button{background:url('/assets/i-help-button.png') no-repeat;cursor:pointer;width: 16px !important;height: 16px;border: none;margin-right: 5px;}
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c5dfd99

Please sign in to comment.