Skip to content

Commit

Permalink
Moved markitup files to js/stylesheet directly. Added thin as webserver.
Browse files Browse the repository at this point in the history
  • Loading branch information
Giang NGUYEN committed Apr 17, 2012
1 parent 41bd69c commit 334f142
Show file tree
Hide file tree
Showing 51 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ doc/
.DS_Store
.rvmrc
routes.txt
public/assets
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'bcrypt-ruby', '3.0.1'
gem 'faker', '1.0.1'
gem 'will_paginate', '3.0.3'
gem 'bootstrap-will_paginate', '0.0.5'

gem 'thin'

group :development, :test do
gem 'sqlite3', '1.3.5'
Expand Down Expand Up @@ -36,3 +36,4 @@ end
group :production do
gem 'pg', '0.12.2'
end

7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
daemons (1.1.8)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.3.2)
Expand Down Expand Up @@ -141,6 +143,10 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
Expand Down Expand Up @@ -174,5 +180,6 @@ DEPENDENCIES
sass-rails (= 3.2.4)
spork (= 0.9.0)
sqlite3 (= 1.3.5)
thin
uglifier (= 1.2.3)
will_paginate (= 3.0.3)
2 changes: 2 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
//= require jquery-ui
//= require jquery_ujs
//= require bootstrap
//= require markitup
//= require set
//= require_tree
//= require_self

Expand Down
File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_directory .
*= require_tree ./markitup
*= require skin_style
*= require set_style
*= require_tree .
*/
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.

0 comments on commit 334f142

Please sign in to comment.