Commit graph

9 commits

Author SHA1 Message Date
Andrew Morgan 7ff229c55f Merge branch 'master' into sca/631-alias-lookup
* master:
  Fix testfile path hardcoded in show-expected-fail-tests.sh (#719)
  Make federation state request 404 when event not in the room - fixes #625 (#716)
  Not all systems have bash (#720)
  Update dependency gomatrixserverlib to 178ed5e (#695)
  Refine config and docs for sytest (#714)
  Fix pipeline, emoji and syntax (#713)
2019-06-25 13:30:23 +01:00
Andrew Morgan bc382bba46
Fix pipeline, emoji and syntax (#713)
Fixes #697

Switched to golangci-lint, fixes issues with buildkite and does some linting fixes to appease the new linters.
2019-06-19 14:05:03 +01:00
Serra Allgood 3d890f3df9 roomserver/alias: Minor fixes, consolidate test cases
Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-03 08:04:36 -07:00
Serra Allgood eaacecc36d Merge branch 'sca/631-alias-lookup' of github.com:serra-allgood/dendrite into sca/631-alias-lookup
Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-02 12:14:17 -07:00
Serra Allgood dc935165cc roomserver/alias: Get tests passing
Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-02 12:07:31 -07:00
Serra Allgood da234d4dab roomserver/alias: Add test cases, load from DB if appserviceAPI says AliasExists
Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-01 17:36:07 -07:00
Serra Allgood 6a7cc65cdb roomserver/alias: don't call appserviceAPI in GetRoomIDForAlias if local alias found
The existing implementation will always make a call to appserviceAPI,
regardless of whether a local alias is found in the database.

Fixes #631

Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-01 17:36:07 -07:00
Serra Allgood 77909e33c1 Merge remote-tracking branch 'origin/master' into sca/631-alias-lookup 2019-05-21 18:36:39 -07:00
ruben 74827428bd use go module for dependencies (#594) 2019-05-21 21:56:55 +01:00