Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "develop" }
DECIDIM_VERSION = { git: "https://github.com/mainio/decidim", branch: "refactor/local-npm-dependencies" }

gem "decidim", DECIDIM_VERSION
#gem "decidim-conferences", DECIDIM_VERSION
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/decidim/decidim
revision: d1c6a85578516015da030aea9931ad0425018883
branch: develop
remote: https://github.com/mainio/decidim
revision: c30cd51aa11ebdaf8533a9a38f954230b23265c1
branch: refactor/local-npm-dependencies
specs:
decidim (0.25.0.dev)
decidim-accountability (= 0.25.0.dev)
Expand Down Expand Up @@ -257,7 +257,7 @@ GEM
ast (2.4.2)
autoprefixer-rails (8.6.5)
execjs
axe-core-api (4.2.0)
axe-core-api (4.2.1)
capybara
dumb_delegator
selenium-webdriver
Expand Down Expand Up @@ -354,8 +354,8 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-i18n (1.9.4)
devise (>= 4.7.1)
devise-i18n (1.10.0)
devise (>= 4.8.0)
devise_invitable (2.0.5)
actionmailer (>= 5.0)
devise (>= 4.6)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# frozen_string_literal: true
# This migration comes from decidim_comments (originally 20210529095942)

class AddDeletedAtColumnToComments < ActiveRecord::Migration[6.0]
def change
add_column :decidim_comments_comments, :deleted_at, :datetime
end
end
3 changes: 2 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2021_06_16_101071) do
ActiveRecord::Schema.define(version: 2021_06_25_081517) do

# These are extensions that must be enabled in order to support this database
enable_extension "ltree"
Expand Down Expand Up @@ -390,6 +390,7 @@
t.string "decidim_author_type", null: false
t.jsonb "body"
t.integer "comments_count", default: 0, null: false
t.datetime "deleted_at"
t.index ["created_at"], name: "index_decidim_comments_comments_on_created_at"
t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_comments_comments_on_decidim_author"
t.index ["decidim_author_id"], name: "decidim_comments_comment_author"
Expand Down
Loading