Skip to content

Commit

Permalink
fix extension parent html url
Browse files Browse the repository at this point in the history
  • Loading branch information
pzupan committed Dec 19, 2019
1 parent f5bdc23 commit 46aa0c5
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion app/views/extensions/_extension.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<% if parent_extension.present? %>
<%= link_to "#{extension.parent_owner_name}/#{extension.parent_name}", owner_scoped_extension_url(parent_extension) %>
<% else %>
<span><%= link_to extension.parent_html_url %> but does not yet have a Bonsai asset.</span>
<span><%= link_to extension.parent_html_url, extension.parent_html_url, target: '_blank' %> (it does not yet have a Bonsai asset).</span>
<% end %>
</span>

Expand Down
2 changes: 1 addition & 1 deletion app/views/extensions/_main_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<%= link_to "#{extension.parent_owner_name}/#{extension.parent_name}", owner_scoped_extension_url(parent_extension) %>
<% else %>
<span><%= extension.parent_owner_name %>/<%= extension.parent_name %></span>
<p>This asset is forked from an upstream project at <%= link_to extension.parent_html_url %> but does not yet have a Bonsai asset. Please contact <%= extension.parent_owner_name %> and see if they need help getting assets listed here</p>
<p>This asset is forked from an upstream project at <%= link_to extension.parent_html_url, extension.parent_html_url, target: '_blank' %> but does not yet have a Bonsai asset. Please contact <%= extension.parent_owner_name %> and see if they need help getting assets listed here</p>
<% end %>
</p>
<% end %>
Expand Down
74 changes: 37 additions & 37 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
enable_extension "pg_trgm"
enable_extension "plpgsql"

create_table "accounts", id: :integer, default: nil, force: :cascade do |t|
create_table "accounts", id: :serial, force: :cascade do |t|
t.integer "user_id"
t.string "uid"
t.string "username"
Expand Down Expand Up @@ -63,15 +63,15 @@
t.index ["key"], name: "index_active_storage_cache_items_on_key"
end

create_table "categories", id: :integer, default: nil, force: :cascade do |t|
create_table "categories", id: :serial, force: :cascade do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.string "slug"
t.index ["slug"], name: "index_categories_on_slug"
end

create_table "ccla_signatures", id: :integer, default: nil, force: :cascade do |t|
create_table "ccla_signatures", id: :serial, force: :cascade do |t|
t.integer "user_id"
t.integer "organization_id"
t.integer "ccla_id"
Expand All @@ -97,7 +97,7 @@
t.index ["user_id"], name: "index_ccla_signatures_on_user_id"
end

create_table "cclas", id: :integer, default: nil, force: :cascade do |t|
create_table "cclas", id: :serial, force: :cascade do |t|
t.string "version"
t.text "head"
t.text "body"
Expand All @@ -106,7 +106,7 @@
t.index ["version"], name: "index_cclas_on_version"
end

create_table "cla_reports", id: :integer, default: nil, force: :cascade do |t|
create_table "cla_reports", id: :serial, force: :cascade do |t|
t.integer "first_ccla_id"
t.integer "last_ccla_id"
t.integer "first_icla_id"
Expand All @@ -119,7 +119,7 @@
t.datetime "updated_at"
end

create_table "collaborators", id: :integer, default: nil, force: :cascade do |t|
create_table "collaborators", id: :serial, force: :cascade do |t|
t.integer "resourceable_id"
t.integer "user_id"
t.datetime "created_at"
Expand All @@ -139,22 +139,22 @@
t.index ["user_id"], name: "index_collections_on_user_id"
end

create_table "commit_shas", id: :integer, default: nil, force: :cascade do |t|
create_table "commit_shas", id: :serial, force: :cascade do |t|
t.string "sha", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.index ["sha"], name: "index_commit_shas_on_sha", unique: true
end

create_table "contributor_request_responses", id: :integer, default: nil, force: :cascade do |t|
create_table "contributor_request_responses", id: :serial, force: :cascade do |t|
t.integer "contributor_request_id", null: false
t.string "decision", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.index ["contributor_request_id"], name: "index_contributor_request_responses_on_contributor_request_id", unique: true
end

create_table "contributor_requests", id: :integer, default: nil, force: :cascade do |t|
create_table "contributor_requests", id: :serial, force: :cascade do |t|
t.integer "organization_id", null: false
t.integer "user_id", null: false
t.datetime "created_at"
Expand All @@ -163,7 +163,7 @@
t.index ["organization_id", "user_id"], name: "index_contributor_requests_on_organization_id_and_user_id", unique: true
end

create_table "contributors", id: :integer, default: nil, force: :cascade do |t|
create_table "contributors", id: :serial, force: :cascade do |t|
t.integer "user_id"
t.integer "organization_id"
t.boolean "admin"
Expand All @@ -174,7 +174,7 @@
t.index ["user_id"], name: "index_contributors_on_user_id"
end

create_table "curry_commit_authors", id: :integer, default: nil, force: :cascade do |t|
create_table "curry_commit_authors", id: :serial, force: :cascade do |t|
t.string "login"
t.string "email"
t.datetime "created_at"
Expand All @@ -184,7 +184,7 @@
t.index ["login"], name: "index_curry_commit_authors_on_login", unique: true
end

create_table "curry_pull_request_comments", id: :integer, default: nil, force: :cascade do |t|
create_table "curry_pull_request_comments", id: :serial, force: :cascade do |t|
t.integer "github_id", null: false
t.integer "pull_request_id", null: false
t.datetime "created_at"
Expand All @@ -194,22 +194,22 @@
t.index ["pull_request_id"], name: "index_curry_pull_request_comments_on_pull_request_id"
end

create_table "curry_pull_request_commit_authors", id: :integer, default: nil, force: :cascade do |t|
create_table "curry_pull_request_commit_authors", id: :serial, force: :cascade do |t|
t.integer "pull_request_id", null: false
t.integer "commit_author_id", null: false
t.index ["commit_author_id", "pull_request_id"], name: "curry_pr_commit_author_ids", unique: true
t.index ["commit_author_id"], name: "idx_cuprc_unknown_committer_id"
t.index ["pull_request_id"], name: "idx_cuprc_pull_request_id"
end

create_table "curry_pull_request_updates", id: :integer, default: nil, force: :cascade do |t|
create_table "curry_pull_request_updates", id: :serial, force: :cascade do |t|
t.datetime "created_at"
t.datetime "updated_at"
t.string "action"
t.integer "pull_request_id", null: false
end

create_table "curry_pull_requests", id: :integer, default: nil, force: :cascade do |t|
create_table "curry_pull_requests", id: :serial, force: :cascade do |t|
t.string "number", null: false
t.integer "repository_id", null: false
t.datetime "created_at"
Expand All @@ -218,15 +218,15 @@
t.index ["repository_id"], name: "index_curry_pull_requests_on_repository_id"
end

create_table "curry_repositories", id: :integer, default: nil, force: :cascade do |t|
create_table "curry_repositories", id: :serial, force: :cascade do |t|
t.string "owner", null: false
t.string "name", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.string "callback_url", null: false
end

create_table "daily_metrics", id: :integer, default: nil, force: :cascade do |t|
create_table "daily_metrics", id: :serial, force: :cascade do |t|
t.string "key", null: false
t.integer "count", default: 0, null: false
t.date "day", null: false
Expand All @@ -235,7 +235,7 @@
t.index ["key", "day"], name: "index_daily_metrics_on_key_and_day"
end

create_table "email_preferences", id: :integer, default: nil, force: :cascade do |t|
create_table "email_preferences", id: :serial, force: :cascade do |t|
t.integer "user_id", null: false
t.integer "system_email_id", null: false
t.string "token", null: false
Expand All @@ -256,7 +256,7 @@
t.index ["user_id"], name: "index_extension_collections_on_user_id"
end

create_table "extension_dependencies", id: :integer, default: nil, force: :cascade do |t|
create_table "extension_dependencies", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.string "version_constraint", default: ">= 0.0.0", null: false
t.integer "extension_version_id", null: false
Expand All @@ -268,15 +268,15 @@
t.index ["extension_version_id"], name: "index_extension_dependencies_on_extension_version_id"
end

create_table "extension_followers", id: :integer, default: nil, force: :cascade do |t|
create_table "extension_followers", id: :serial, force: :cascade do |t|
t.integer "extension_id", null: false
t.integer "user_id", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.index ["extension_id", "user_id"], name: "index_extension_followers_on_extension_id_and_user_id", unique: true
end

create_table "extension_version_content_items", id: :integer, default: nil, force: :cascade do |t|
create_table "extension_version_content_items", id: :serial, force: :cascade do |t|
t.integer "extension_version_id", null: false
t.string "name", null: false
t.string "path", null: false
Expand All @@ -288,15 +288,15 @@
t.index ["extension_version_id"], name: "index_extension_version_content_items_on_extension_version_id"
end

create_table "extension_version_platforms", id: :integer, default: nil, force: :cascade do |t|
create_table "extension_version_platforms", id: :serial, force: :cascade do |t|
t.integer "extension_version_id"
t.integer "supported_platform_id"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["extension_version_id", "supported_platform_id"], name: "index_cvp_on_cvi_and_spi", unique: true
end

create_table "extension_versions", id: :integer, default: nil, force: :cascade do |t|
create_table "extension_versions", id: :serial, force: :cascade do |t|
t.integer "extension_id"
t.string "license"
t.string "version"
Expand Down Expand Up @@ -334,7 +334,7 @@
t.index ["version"], name: "index_extension_versions_on_version"
end

create_table "extensions", id: :integer, default: nil, force: :cascade do |t|
create_table "extensions", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.datetime "created_at"
t.datetime "updated_at"
Expand Down Expand Up @@ -376,21 +376,21 @@
t.index ["user_id"], name: "index_extensions_on_user_id"
end

create_table "github_organizations", id: :integer, default: nil, force: :cascade do |t|
create_table "github_organizations", id: :serial, force: :cascade do |t|
t.integer "github_id", null: false
t.string "name", null: false
t.string "avatar_url", null: false
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "hits", id: :integer, default: nil, force: :cascade do |t|
create_table "hits", id: :serial, force: :cascade do |t|
t.string "label", null: false
t.integer "total", default: 0, null: false
t.index ["label"], name: "index_hits_on_label", unique: true
end

create_table "icla_signatures", id: :integer, default: nil, force: :cascade do |t|
create_table "icla_signatures", id: :serial, force: :cascade do |t|
t.integer "user_id"
t.datetime "signed_at"
t.string "prefix"
Expand All @@ -411,7 +411,7 @@
t.index ["user_id"], name: "index_icla_signatures_on_user_id"
end

create_table "iclas", id: :integer, default: nil, force: :cascade do |t|
create_table "iclas", id: :serial, force: :cascade do |t|
t.string "version"
t.text "head"
t.text "body"
Expand All @@ -420,7 +420,7 @@
t.index ["version"], name: "index_iclas_on_version"
end

create_table "invitations", id: :integer, default: nil, force: :cascade do |t|
create_table "invitations", id: :serial, force: :cascade do |t|
t.integer "organization_id"
t.string "email"
t.string "token"
Expand All @@ -431,12 +431,12 @@
t.index ["organization_id"], name: "index_invitations_on_organization_id"
end

create_table "organizations", id: :integer, default: nil, force: :cascade do |t|
create_table "organizations", id: :serial, force: :cascade do |t|
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "ownership_transfer_requests", id: :integer, default: nil, force: :cascade do |t|
create_table "ownership_transfer_requests", id: :serial, force: :cascade do |t|
t.integer "extension_id", null: false
t.integer "recipient_id", null: false
t.integer "sender_id", null: false
Expand Down Expand Up @@ -472,20 +472,20 @@
t.index ["platform"], name: "index_release_assets_on_platform"
end

create_table "supported_platforms", id: :integer, default: nil, force: :cascade do |t|
create_table "supported_platforms", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.date "released_on", null: false
end

create_table "system_emails", id: :integer, default: nil, force: :cascade do |t|
create_table "system_emails", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "taggings", id: :integer, default: nil, force: :cascade do |t|
create_table "taggings", id: :serial, force: :cascade do |t|
t.string "taggable_type"
t.integer "taggable_id"
t.integer "tag_id"
Expand All @@ -496,7 +496,7 @@
t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
end

create_table "tags", id: :integer, default: nil, force: :cascade do |t|
create_table "tags", id: :serial, force: :cascade do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
Expand All @@ -512,7 +512,7 @@
t.index ["rank"], name: "index_tiers_on_rank"
end

create_table "tools", id: :integer, default: nil, force: :cascade do |t|
create_table "tools", id: :serial, force: :cascade do |t|
t.integer "user_id"
t.string "name"
t.string "type"
Expand All @@ -529,7 +529,7 @@
t.index ["user_id"], name: "index_tools_on_user_id"
end

create_table "users", id: :integer, default: nil, force: :cascade do |t|
create_table "users", id: :serial, force: :cascade do |t|
t.string "first_name"
t.string "last_name"
t.datetime "created_at"
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
version: '2'
services:
db:
image: postgres:9.6
image: postgres
ports:
- 5433:5432
volumes:
Expand Down

0 comments on commit 46aa0c5

Please sign in to comment.