Skip to content

Commit

Permalink
fixed conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Bibhas committed Jun 1, 2017
2 parents f112e6c + 9f875b6 commit cc369e6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions imgee/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ def mkdir_p(dirname):
os.makedirs(dirname)


def error403(error):
return redirect(url_for('login'))


# Configure the app
coaster.app.init_app(app)
migrate = Migrate(app, db)
baseframe.init_app(app, requires=['baseframe', 'picturefill', 'imgee'])
app.error_handlers[403] = error403
lastuser.init_app(app)
lastuser.init_usermanager(UserManager(db, models.User))


@app.errorhandler(403)
def error403(error):
return redirect(url_for('login'))

if app.config.get('MEDIA_DOMAIN') and (
app.config['MEDIA_DOMAIN'].startswith('http:') or
app.config['MEDIA_DOMAIN'].startswith('https:')):
Expand Down

0 comments on commit cc369e6

Please sign in to comment.