Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored /web shared files (middleware and utils) to new shared folder #9892

Merged
merged 3 commits into from
Sep 20, 2018

Conversation

rishabhgrg
Copy link
Contributor

refs #9866

  • Moves web/middleware -> web/shared/middleware
  • Moves web/utils.js -> web/shared/utils.js

@rishabhgrg rishabhgrg force-pushed the api-versioning-shared-middleware branch from 6655149 to 32e9f34 Compare September 20, 2018 17:00
@rishabhgrg rishabhgrg requested review from naz and kirrg001 September 20, 2018 17:02
@kirrg001 kirrg001 self-assigned this Sep 20, 2018
@@ -327,7 +327,7 @@ authentication = {
return updatedUser.save(options);
})
.catch(common.errors.ValidationError, (err) => {
return Promise.reject(err);
return Promise.reject(err);

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

@@ -10,7 +10,7 @@ const Promise = require('bluebird'),
urlService = require('../services/url'),
localUtils = require('./utils'),
models = require('../models'),
spamPrevention = require('../web/middleware/api/spam-prevention'),
spamPrevention = require('../web/shared/middleware/api/spam-prevention'),

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

@rishabhgrg rishabhgrg force-pushed the api-versioning-shared-middleware branch from 32e9f34 to cc42c74 Compare September 20, 2018 17:49
Copy link
Contributor

@kirrg001 kirrg001 left a comment

Choose a reason for hiding this comment

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

👍

@kirrg001 kirrg001 merged commit fcd275f into TryGhost:master Sep 20, 2018
allouis added a commit that referenced this pull request Sep 25, 2018
* master: (25 commits)
  Version bump to 2.1.4
  Updated Ghost-Admin to 2.1.4
  Version bump to 2.1.4-beta.1
  Updated Ghost-Admin to 2.1.4-beta.1
  Updated private-sites to not redirect to full urls
  Bumped ghost-ignition to version 2.9.6
  Upgrading Casper to 2.6.3
  Refactored url utility to generate multiple API version URLs (#9897)
  Added new endpoint to upload square profile images with dimension validation (#9862)
  Removed change frequency and priority fields from sitemap generator (#9771)
  🎨Added case insensitive support for redirects (#9755)
  Refactored direct usages of api controllers
  Normalised how we require models
  Refactored how we require shared middlewares from web/ (#9893)
  Removed duplicate 'id' for User permittedOptions
  Updated permittedOptions to correctly call super
  Updated base model to remove extraAllowedProperties
  Extended uncapitalise unit tests (#9891)
  Removed `res.isAdmin` from admin express app (#9889)
  Refactored `web/middleware` and `web/utils` to `web/shared` (#9892)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants