|
|
|
@@ -161,8 +161,9 @@ class WikiPagesController < ApplicationController |
|
|
|
revision_id = rev.id |
|
|
|
pred = page.pred_revision_id(revision_id) |
|
|
|
succ = page.succ_revision_id(revision_id) |
|
|
|
updated_at = rev.created_at |
|
|
|
|
|
|
|
return render json: page.as_json.merge(body:, revision_id:, pred:, succ:) |
|
|
|
return render json: page.as_json.merge(body:, revision_id:, pred:, succ:, updated_at:) |
|
|
|
end |
|
|
|
|
|
|
|
rev = page.current_revision |
|
|
|
@@ -180,8 +181,9 @@ class WikiPagesController < ApplicationController |
|
|
|
revision_id = rev.id |
|
|
|
pred = page.pred_revision_id(revision_id) |
|
|
|
succ = page.succ_revision_id(revision_id) |
|
|
|
updated_at = rev.created_at |
|
|
|
|
|
|
|
render json: page.as_json.merge(body:, revision_id:, pred:, succ:) |
|
|
|
render json: page.as_json.merge(body:, revision_id:, pred:, succ:, updated_at:) |
|
|
|
end |
|
|
|
|
|
|
|
def render_wiki_conflict err |
|
|
|
|