Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Update Apache Setup To Remove Location Syntax #4870

Merged
merged 5 commits into from
Mar 21, 2019

Conversation

cwmke
Copy link
Contributor

@cwmke cwmke commented Mar 16, 2019

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off

This one should close #4841. Many thanks to @dev4223 for bringing it up and finding a solution.

Signed-off-by: Colin White

Remove location syntax
Remove location syntax.
@richvdh
Copy link
Member

richvdh commented Mar 19, 2019

please could you add a quick note to the changelog directory so that the CI passes?

@cwmke
Copy link
Contributor Author

cwmke commented Mar 21, 2019

Should be set now. 😁

@codecov
Copy link

codecov bot commented Mar 21, 2019

Codecov Report

Merging #4870 into develop will increase coverage by 12.38%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##           develop    #4870       +/-   ##
============================================
+ Coverage    59.57%   71.95%   +12.38%     
============================================
  Files          326      304       -22     
  Lines        33921    33148      -773     
  Branches      5597     5510       -87     
============================================
+ Hits         20209    23853     +3644     
+ Misses       12298     7620     -4678     
- Partials      1414     1675      +261

@codecov
Copy link

codecov bot commented Mar 21, 2019

Codecov Report

Merging #4870 into develop will increase coverage by 17.66%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##           develop    #4870       +/-   ##
============================================
+ Coverage    59.57%   77.24%   +17.66%     
============================================
  Files          326      326               
  Lines        33921    35259     +1338     
  Branches      5597     6023      +426     
============================================
+ Hits         20209    27235     +7026     
+ Misses       12298     6318     -5980     
- Partials      1414     1706      +292

@richvdh richvdh self-requested a review March 21, 2019 10:08
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@richvdh richvdh merged commit ab4e4c6 into matrix-org:develop Mar 21, 2019
anoadragon453 added a commit that referenced this pull request Mar 26, 2019
* develop: (141 commits)
  Make federation endpoints more tolerant of trailing slashes v2 (#4935)
  Fix ClientReplicationStreamProtocol.__str__ (#4929)
  Fix bug where read-receipts lost their timestamps (#4927)
  Use an explicit dbname for postgres connections in the tests. (#4928)
  Fix nginx example in ACME doc. (#4923)
  Refactor out state delta handling into its own class (#4917)
  Newsfile
  Use yaml safe_load
  Allow newsfragments to end with exclamation marks! (#4912)
  Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)
  Clean up backoff_on_404 and metehod calls
  Update changelog.d/4908.bugfix
  Update Apache Setup To Remove Location Syntax (#4870)
  isort
  Newsfile
  Fix typo and add description
  Deny peeking into rooms that have been blocked
  Rejig testcase to make it more extensible
  Remove debug
  Add tests
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants