Merge branch 'master' into redesign-2015
Audited14a395ed8e64
Actions

Description

Merge branch 'master' into redesign-2015

Details

Group Auditors

Provenance

epriestley	Authored on
epriestley	Pushed on Jun 25 2015, 5:07 PM

Parents

rPdb1bc7fd7f1f: Carefully avoid the harbormaster/differential race
rPa89483ee5b86: [Redesign] Swap Slabo for Roboto Slab

Branches

Unknown

Tags

Unknown

Event Timeline

epriestley committed rP14a395ed8e64: Merge branch 'master' into redesign-2015 (authored by epriestley).Jun 25 2015, 5:06 PM

Herald added auditors: Fakhra.Aftab, Cowboy Commits. · View Herald TranscriptJun 25 2015, 5:07 PM

btrahan accepted this commit.Jun 25 2015, 10:48 PM

Merged Changes

db1bc7fd7f1f Carefully avoid the harbormaster/differential race
Author
epriestley
Revisions
D13441: Carefully avoid the harbormaster/differential race
Browse Repository
No Builds
No Audits
5f99d79c5d17 Fix type spec for 'coverage'
Author
epriestley
Revisions
D13435: Fix type spec for 'coverage'
Browse Repository
No Builds
No Audits
1192f309b016 Fix an issue with handling of `null` feed URIs
Author
epriestley
Revisions
D13432: Fix an issue with handling of `null` feed URIs
Browse Repository
No Builds
No Audits
8b9428b6dac2 Fix a possible undefined variable
Author
epriestley
Revisions
D13430: Fix a possible undefined variable
Browse Repository
No Builds
No Audits
189fb2660a90 MetaMTA - make sure mail garbage collection also cleans up recipient edges
Author
btrahan
Revisions
D13408: MetaMTA - make sure mail garbage collection also cleans up recipient edges
Browse Repository
No Builds
No Audits
fcb35a55fd23 Support Spaces in Diffusion
Author
epriestley
Revisions
D13414: Support Spaces in Diffusion
Browse Repository
No Builds
No Audits
c1dca8238f7d MetaMTA - make the new mail app UI a little less bad
Author
btrahan
Revisions
D13410: MetaMTA - make the new mail app UI a little less bad
Browse Repository
No Builds
No Audits
8ccd28088911 Fixing an overlooked counter
Author
lpriestley
Revisions
D13411: Fixing an overlooked counter
Browse Repository
No Builds
No Audits
3c7f4e5c5b1c Remove duplicate duplicate words which are not requires
Author
eadler
Revisions
D13412: Remove duplicate duplicate words which are not requires
Browse Repository
No Builds
No Audits

Changes (23)

Path

Size

resources/

sql/

autopatches/

	20150624.spaces.1.repo.sql
	20141210.reposervice.sql

src/

__phutil_library_map__.php

applications/

differential/

editor/

DifferentialTransactionEditor.php

diffusion/

controller/

DiffusionRepositoryCreateController.php

DiffusionRepositoryEditMainController.php

diviner/

query/

DivinerAtomQuery.php

feed/

worker/

FeedPublisherWorker.php

files/

storage/

PhabricatorFile.php

__tests__/

PhabricatorFileTestCase.php

harbormaster/

engine/

HarbormasterBuildEngine.php

storage/

build/

HarbormasterBuildUnitMessage.php

metamta/

controller/

PhabricatorMetaMTAMailViewController.php

garbagecollector/

MetaMTAMailSentGarbageCollector.php

query/

PhabricatorMetaMTAMailSearchEngine.php

storage/

PhabricatorMetaMTAMail.php

repository/

query/

PhabricatorRepositorySearchEngine.php

storage/

PhabricatorRepository.php

subscriptions/

controller/

PhabricatorSubscriptionsListController.php

docs/

user/

configuration/

troubleshooting_https.diviner

field/

repository_imports.diviner

userguide/

diffusion_updates.diviner

view/

form/

control/

AphrontFormPolicyControl.php

phui/

calendar/

PHUICalendarMonthView.php

rP14a395ed8e64

View Options

resources/sql/autopatches/20150624.spaces.1.repo.sql

View Options

src/__phutil_library_map__.php

View Options

src/applications/differential/editor/DifferentialTransactionEditor.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryCreateController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

View Options

src/applications/diviner/query/DivinerAtomQuery.php

View Options

src/applications/feed/worker/FeedPublisherWorker.php

View Options

src/applications/files/storage/PhabricatorFile.php

View Options

src/applications/files/storage/tests/PhabricatorFileTestCase.php

View Options

src/applications/harbormaster/engine/HarbormasterBuildEngine.php

View Options

src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php

View Options

src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php

View Options

src/applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php

View Options

src/applications/metamta/query/PhabricatorMetaMTAMailSearchEngine.php

View Options

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

View Options

src/applications/repository/query/PhabricatorRepositorySearchEngine.php

View Options

src/applications/repository/storage/PhabricatorRepository.php

View Options

src/applications/subscriptions/controller/PhabricatorSubscriptionsListController.php

View Options

src/docs/user/configuration/troubleshooting_https.diviner

View Options

src/docs/user/field/repository_imports.diviner

View Options

src/docs/user/userguide/diffusion_updates.diviner

View Options

src/view/form/control/AphrontFormPolicyControl.php

View Options

src/view/phui/calendar/PHUICalendarMonthView.php

Merge branch 'master' into redesign-2015Audited14a395ed8e64Actions

Description

Details

Event Timeline

Merged Changes

Changes (23)

rP14a395ed8e64

resources/sql/autopatches/20150624.spaces.1.repo.sql

src/__phutil_library_map__.php

src/applications/differential/editor/DifferentialTransactionEditor.php

src/applications/diffusion/controller/DiffusionRepositoryCreateController.php

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

src/applications/diviner/query/DivinerAtomQuery.php

src/applications/feed/worker/FeedPublisherWorker.php

src/applications/files/storage/PhabricatorFile.php

src/applications/files/storage/__tests__/PhabricatorFileTestCase.php

src/applications/harbormaster/engine/HarbormasterBuildEngine.php

src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php

src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php

src/applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php

src/applications/metamta/query/PhabricatorMetaMTAMailSearchEngine.php

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

src/applications/repository/query/PhabricatorRepositorySearchEngine.php

src/applications/repository/storage/PhabricatorRepository.php

src/applications/subscriptions/controller/PhabricatorSubscriptionsListController.php

src/docs/user/configuration/troubleshooting_https.diviner

src/docs/user/field/repository_imports.diviner

src/docs/user/userguide/diffusion_updates.diviner

src/view/form/control/AphrontFormPolicyControl.php

src/view/phui/calendar/PHUICalendarMonthView.php

Merge branch 'master' into redesign-2015
Audited14a395ed8e64
Actions

src/applications/files/storage/tests/PhabricatorFileTestCase.php