Homec4science
Diffusion Phabricator 3c8d88deb454

Don't warn about conflicts when reverting Phriction documents
3c8d88deb454
Actions

Authored by epriestley <git@epriestley.com> on May 22 2014, 01:05.

Description

Don't warn about conflicts when reverting Phriction documents

Summary:
Fixes T5144. This was incorrectly checking the content version, not the head version, so reverts would raise the "conflict" warning.

Also fix a couple of FontAwesome icons.

Test Plan:

  • Edited a document.
  • Reverted a document.
  • Opened two edit tabs. Edited one, tried to edit #2, got a warning.
  • Opened two revert tabs. Reverted in one, tried to revert in #2, got a warning.

Reviewers: btrahan, chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T5144

Differential Revision: https://secure.phabricator.com/D9249

Details

Committed
epriestley <git@epriestley.com>May 22 2014, 01:05
Pushed
aubortJan 31 2017, 17:16
Parents
rPH2ad501873ae4: Fix changeset layout in Modern Firefox
Branches
Unknown
Tags
Unknown
[cURL/7] (http://10.0.1.35:80/api/diffusion.mergedcommitsquery) <CURLE_COULDNT_CONNECT> The cURL library raised an error while making a request. You may be able to find more information about this error (error code: 7) on the cURL site: http://curl.haxx.se/libcurl/c/libcurl-errors.html#CURLECOULDNTCONNECT

Event Timeline

epriestley <git@epriestley.com> committed rPH3c8d88deb454: Don't warn about conflicts when reverting Phriction documents (authored by epriestley <git@epriestley.com>).May 22 2014, 01:05

Changes (2)

Path
Msrc/applications/phriction/controller/PhrictionEditController.php
Msrc/applications/phriction/controller/PhrictionHistoryController.php

rPH3c8d88deb454

View Options

src/applications/phriction/controller/PhrictionEditController.php

Loading...
View Options

src/applications/phriction/controller/PhrictionHistoryController.php

Loading...
c4science ยท Help