diff options
| -rw-r--r-- | app/assets/stylesheets/common.scss | 4 | ||||
| -rw-r--r-- | app/views/wikis/show.html.haml | 4 | ||||
| -rw-r--r-- | db/schema.rb | 36 |
3 files changed, 24 insertions, 20 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e2b3c9dee7a..cce666a3f6e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1145,3 +1145,7 @@ li.note { max-width:100%; } } + +.wiki_content code, .readme code{ + background-color: inherit; +} diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index 696f6ec753c..1b66fd3382e 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -7,8 +7,8 @@ = link_to edit_project_wiki_path(@project, @wiki), :class => "btn small" do Edit %hr - -= markdown_to_html @wiki.content +.wiki_content + = markdown_to_html @wiki.content %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} - if can? current_user, :admin_wiki, @project diff --git a/db/schema.rb b/db/schema.rb index c1326ca8d11..98993a9ae5e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.integer "assignee_id" t.integer "author_id" t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.boolean "closed", :default => false, :null => false t.integer "position", :default => 0 t.boolean "critical", :default => false, :null => false @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do create_table "keys", :force => true do |t| t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.text "key" t.string "title" t.string "identifier" @@ -59,8 +59,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.integer "assignee_id" t.string "title" t.boolean "closed", :default => false, :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.text "st_commits" t.text "st_diffs" t.boolean "merged", :default => false, :null => false @@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.string "noteable_id" t.string "noteable_type" t.integer "author_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "project_id" t.string "attachment" t.string "line_code" @@ -87,8 +87,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.string "name" t.string "path" t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.boolean "private_flag", :default => true, :null => false t.string "code" t.integer "owner_id" @@ -111,8 +111,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.text "content" t.integer "author_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "file_name" t.datetime "expires_at" end @@ -145,8 +145,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "name" t.boolean "admin", :default => false, :null => false t.integer "projects_limit", :default => 10 @@ -165,16 +165,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) do create_table "users_projects", :force => true do |t| t.integer "user_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "project_access", :default => 0, :null => false end create_table "web_hooks", :force => true do |t| t.string "url" t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end create_table "wikis", :force => true do |t| |