Commit 442d5dbef2d0ffbb40cc9ea8de708c00011e2712
1 parent
474a42cf
Exists in
master
and in
4 other branches
fixed yellow background in markdown documents
Showing
3 changed files
with
24 additions
and
20 deletions
Show diff stats
app/assets/stylesheets/common.scss
app/views/wikis/show.html.haml
| @@ -7,8 +7,8 @@ | @@ -7,8 +7,8 @@ | ||
| 7 | = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do | 7 | = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do |
| 8 | Edit | 8 | Edit |
| 9 | %hr | 9 | %hr |
| 10 | - | ||
| 11 | -= markdown_to_html @wiki.content | 10 | +.wiki_content |
| 11 | + = markdown_to_html @wiki.content | ||
| 12 | 12 | ||
| 13 | %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} | 13 | %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} |
| 14 | - if can? current_user, :admin_wiki, @project | 14 | - if can? current_user, :admin_wiki, @project |
db/schema.rb
| @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 30 | t.integer "assignee_id" | 30 | t.integer "assignee_id" |
| 31 | t.integer "author_id" | 31 | t.integer "author_id" |
| 32 | t.integer "project_id" | 32 | t.integer "project_id" |
| 33 | - t.datetime "created_at", :null => false | ||
| 34 | - t.datetime "updated_at", :null => false | 33 | + t.datetime "created_at" |
| 34 | + t.datetime "updated_at" | ||
| 35 | t.boolean "closed", :default => false, :null => false | 35 | t.boolean "closed", :default => false, :null => false |
| 36 | t.integer "position", :default => 0 | 36 | t.integer "position", :default => 0 |
| 37 | t.boolean "critical", :default => false, :null => false | 37 | t.boolean "critical", :default => false, :null => false |
| @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 43 | 43 | ||
| 44 | create_table "keys", :force => true do |t| | 44 | create_table "keys", :force => true do |t| |
| 45 | t.integer "user_id" | 45 | t.integer "user_id" |
| 46 | - t.datetime "created_at", :null => false | ||
| 47 | - t.datetime "updated_at", :null => false | 46 | + t.datetime "created_at" |
| 47 | + t.datetime "updated_at" | ||
| 48 | t.text "key" | 48 | t.text "key" |
| 49 | t.string "title" | 49 | t.string "title" |
| 50 | t.string "identifier" | 50 | t.string "identifier" |
| @@ -59,8 +59,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -59,8 +59,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 59 | t.integer "assignee_id" | 59 | t.integer "assignee_id" |
| 60 | t.string "title" | 60 | t.string "title" |
| 61 | t.boolean "closed", :default => false, :null => false | 61 | t.boolean "closed", :default => false, :null => false |
| 62 | - t.datetime "created_at", :null => false | ||
| 63 | - t.datetime "updated_at", :null => false | 62 | + t.datetime "created_at" |
| 63 | + t.datetime "updated_at" | ||
| 64 | t.text "st_commits" | 64 | t.text "st_commits" |
| 65 | t.text "st_diffs" | 65 | t.text "st_diffs" |
| 66 | t.boolean "merged", :default => false, :null => false | 66 | t.boolean "merged", :default => false, :null => false |
| @@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 73 | t.string "noteable_id" | 73 | t.string "noteable_id" |
| 74 | t.string "noteable_type" | 74 | t.string "noteable_type" |
| 75 | t.integer "author_id" | 75 | t.integer "author_id" |
| 76 | - t.datetime "created_at", :null => false | ||
| 77 | - t.datetime "updated_at", :null => false | 76 | + t.datetime "created_at" |
| 77 | + t.datetime "updated_at" | ||
| 78 | t.integer "project_id" | 78 | t.integer "project_id" |
| 79 | t.string "attachment" | 79 | t.string "attachment" |
| 80 | t.string "line_code" | 80 | t.string "line_code" |
| @@ -87,8 +87,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -87,8 +87,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 87 | t.string "name" | 87 | t.string "name" |
| 88 | t.string "path" | 88 | t.string "path" |
| 89 | t.text "description" | 89 | t.text "description" |
| 90 | - t.datetime "created_at", :null => false | ||
| 91 | - t.datetime "updated_at", :null => false | 90 | + t.datetime "created_at" |
| 91 | + t.datetime "updated_at" | ||
| 92 | t.boolean "private_flag", :default => true, :null => false | 92 | t.boolean "private_flag", :default => true, :null => false |
| 93 | t.string "code" | 93 | t.string "code" |
| 94 | t.integer "owner_id" | 94 | t.integer "owner_id" |
| @@ -111,8 +111,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -111,8 +111,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 111 | t.text "content" | 111 | t.text "content" |
| 112 | t.integer "author_id", :null => false | 112 | t.integer "author_id", :null => false |
| 113 | t.integer "project_id", :null => false | 113 | t.integer "project_id", :null => false |
| 114 | - t.datetime "created_at", :null => false | ||
| 115 | - t.datetime "updated_at", :null => false | 114 | + t.datetime "created_at" |
| 115 | + t.datetime "updated_at" | ||
| 116 | t.string "file_name" | 116 | t.string "file_name" |
| 117 | t.datetime "expires_at" | 117 | t.datetime "expires_at" |
| 118 | end | 118 | end |
| @@ -145,8 +145,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -145,8 +145,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 145 | t.datetime "last_sign_in_at" | 145 | t.datetime "last_sign_in_at" |
| 146 | t.string "current_sign_in_ip" | 146 | t.string "current_sign_in_ip" |
| 147 | t.string "last_sign_in_ip" | 147 | t.string "last_sign_in_ip" |
| 148 | - t.datetime "created_at", :null => false | ||
| 149 | - t.datetime "updated_at", :null => false | 148 | + t.datetime "created_at" |
| 149 | + t.datetime "updated_at" | ||
| 150 | t.string "name" | 150 | t.string "name" |
| 151 | t.boolean "admin", :default => false, :null => false | 151 | t.boolean "admin", :default => false, :null => false |
| 152 | t.integer "projects_limit", :default => 10 | 152 | t.integer "projects_limit", :default => 10 |
| @@ -165,16 +165,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | @@ -165,16 +165,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) do | ||
| 165 | create_table "users_projects", :force => true do |t| | 165 | create_table "users_projects", :force => true do |t| |
| 166 | t.integer "user_id", :null => false | 166 | t.integer "user_id", :null => false |
| 167 | t.integer "project_id", :null => false | 167 | t.integer "project_id", :null => false |
| 168 | - t.datetime "created_at", :null => false | ||
| 169 | - t.datetime "updated_at", :null => false | 168 | + t.datetime "created_at" |
| 169 | + t.datetime "updated_at" | ||
| 170 | t.integer "project_access", :default => 0, :null => false | 170 | t.integer "project_access", :default => 0, :null => false |
| 171 | end | 171 | end |
| 172 | 172 | ||
| 173 | create_table "web_hooks", :force => true do |t| | 173 | create_table "web_hooks", :force => true do |t| |
| 174 | t.string "url" | 174 | t.string "url" |
| 175 | t.integer "project_id" | 175 | t.integer "project_id" |
| 176 | - t.datetime "created_at", :null => false | ||
| 177 | - t.datetime "updated_at", :null => false | 176 | + t.datetime "created_at" |
| 177 | + t.datetime "updated_at" | ||
| 178 | end | 178 | end |
| 179 | 179 | ||
| 180 | create_table "wikis", :force => true do |t| | 180 | create_table "wikis", :force => true do |t| |