Permalink
Browse files

Merge branch 'development'

  • Loading branch information...
2 parents 4694a74 + d69b68a commit 4584bfa744b21d6b63b6cec860a54f6b040009ec @PavelTyk committed Jan 11, 2012
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '2.3.8'
+gem 'rails', '2.3.14'
gem 'jrails', '~> 0.6'
gem 'haml', '~> 2.2.24'
gem 'simple-navigation', '~> 2.5.3'
View
@@ -1,20 +1,20 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (2.3.8)
- actionpack (= 2.3.8)
- actionpack (2.3.8)
- activesupport (= 2.3.8)
+ actionmailer (2.3.14)
+ actionpack (= 2.3.14)
+ actionpack (2.3.14)
+ activesupport (= 2.3.14)
rack (~> 1.1.0)
- activerecord (2.3.8)
- activesupport (= 2.3.8)
- activeresource (2.3.8)
- activesupport (= 2.3.8)
- activesupport (2.3.8)
+ activerecord (2.3.14)
+ activesupport (= 2.3.14)
+ activeresource (2.3.14)
+ activesupport (= 2.3.14)
+ activesupport (2.3.14)
authlogic (2.1.6)
activesupport
cgi_multipart_eof_fix (2.5.0)
- daemons (1.1.0)
+ daemons (1.1.5)
faker (0.3.1)
fastthread (1.0.7)
gem_plugin (0.2.3)
@@ -27,28 +27,30 @@ GEM
fastthread (>= 1.0.1)
gem_plugin (>= 0.2.3)
mysql (2.8.1)
- pg (0.9.0)
- rack (1.1.0)
+ pg (0.12.2)
+ rack (1.1.3)
rack-openid (0.2.3)
rack (>= 0.4)
ruby-openid (>= 2.1.6)
- rails (2.3.8)
- actionmailer (= 2.3.8)
- actionpack (= 2.3.8)
- activerecord (= 2.3.8)
- activeresource (= 2.3.8)
- activesupport (= 2.3.8)
+ rails (2.3.14)
+ actionmailer (= 2.3.14)
+ actionpack (= 2.3.14)
+ activerecord (= 2.3.14)
+ activeresource (= 2.3.14)
+ activesupport (= 2.3.14)
rake (>= 0.8.3)
- rake (0.8.7)
- rdiscount (1.6.5)
- rspec (1.3.1)
- rspec-rails (1.3.3)
+ rake (0.9.2.2)
+ rdiscount (1.6.8)
+ rspec (1.3.2)
+ rspec-rails (1.3.4)
rack (>= 1.0.0)
- rspec (= 1.3.1)
+ rspec (~> 1.3.1)
ruby-openid (2.1.8)
simple-navigation (2.5.4)
- sqlite3-ruby (1.3.2)
- will_paginate (2.3.15)
+ sqlite3 (1.3.5)
+ sqlite3-ruby (1.3.3)
+ sqlite3 (>= 1.3.3)
+ will_paginate (2.3.16)
PLATFORMS
ruby
@@ -63,7 +65,7 @@ DEPENDENCIES
mysql
pg
rack-openid (~> 0.2.1)
- rails (= 2.3.8)
+ rails (= 2.3.14)
rdiscount
rspec (~> 1.3.0)
rspec-rails (~> 1.3.2)
View
@@ -2,7 +2,7 @@ h2. Code Snippets Storage
Code snippets storage with tag support and rich search functionality.
-"http://code-snippets.heroku.com":http://code-snippets.heroku.com
+"http://code-snippets.paveltyk.info":http://code-snippets.paveltyk.info
h2. Hacking
@@ -1,3 +1,4 @@
= f.text_area :code, :class => 'code', :placeholder => 'Write Your Code Snippet Here', :title => 'Code goes here'
= f.text_area :description, :class => 'description', :placeholder => 'Write Code Snippet Description Here', :title => 'Description goes here'
= f.text_field :tag_list, :placeholder => 'Write Code Snippet\'s Tags Here', :title => 'Tags go here'
+= f.text_field :lang, :placeholder => 'autodetect', :title => 'The language of snippet'
@@ -10,6 +10,6 @@
= link_to snippet.user.username, user_path(snippet.user), :title => snippet.user.username
-if snippet.description.present?
.description= snippet.description_html
- %pre= content_tag :code, h(snippet.code)
+ %pre= content_tag :code, snippet.code, :class => snippet.lang
.footer
.tags= render_tag_list(snippet.tag_list)
View
@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
require File.join(File.dirname(__FILE__), 'boot')
@@ -0,0 +1,9 @@
+class AddLangColumnToSnippets < ActiveRecord::Migration
+ def self.up
+ add_column :snippets, :lang, :string
+ end
+
+ def self.down
+ remove_column :snippets, :lang
+ end
+end
View
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20101111143136) do
+ActiveRecord::Schema.define(:version => 20120109084130) do
create_table "open_id_authentication_associations", :force => true do |t|
t.integer "issued"
@@ -43,6 +43,7 @@
t.datetime "created_at"
t.datetime "updated_at"
t.string "cached_tag_list"
+ t.string "lang"
end
create_table "taggings", :force => true do |t|
@@ -69,4 +70,6 @@
t.string "permalink"
end
+ add_index "users", ["permalink"], :name => "index_users_on_permalink"
+
end
@@ -85,6 +85,9 @@ form.snippet textarea {padding:10px;margin-bottom:15px;}
form.snippet textarea.code {height:260px;font-family:Consolas,Menlo,Monaco,'Lucida Console','DejaVu Sans Mono','Liberation Mono','Bitstream Vera Sans Mono','Courier New',monospace;}
form.snippet textarea.description {height:100px;}
form.snippet .text {padding:5px 10px;margin-bottom:15px;}
+form.snippet #snippet_tag_list {width:660px;display:inline-block;}
+form.snippet #snippet_lang {width:72px;display:inline-block;}
+form.snippet .submit {display:block;}
#tag-name-search {display:block;margin-bottom:10px;width:758px;font-size:24px;padding:5px 10px;}
#tag-name-search.ajax {background:url("/images/ajax-loader.gif") no-repeat 755px 11px;}

0 comments on commit 4584bfa

Please sign in to comment.