mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 06:06:22 +01:00
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
This commit is contained in:
commit
530fcc1c14
@ -1,17 +1,8 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import PropTypes from 'prop-types';
|
import ColumnBackButton from './column_back_button';
|
||||||
|
|
||||||
export default class ColumnBackButtonSlim extends React.PureComponent {
|
export default class ColumnBackButtonSlim extends ColumnBackButton {
|
||||||
|
|
||||||
static contextTypes = {
|
|
||||||
router: PropTypes.object,
|
|
||||||
};
|
|
||||||
|
|
||||||
handleClick = () => {
|
|
||||||
if (window.history && window.history.length === 1) this.context.router.history.push('/');
|
|
||||||
else this.context.router.history.goBack();
|
|
||||||
}
|
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
return (
|
return (
|
||||||
|
@ -4,6 +4,8 @@ services:
|
|||||||
db:
|
db:
|
||||||
restart: always
|
restart: always
|
||||||
image: postgres:9.6-alpine
|
image: postgres:9.6-alpine
|
||||||
|
networks:
|
||||||
|
- internal_network
|
||||||
### Uncomment to enable DB persistance
|
### Uncomment to enable DB persistance
|
||||||
# volumes:
|
# volumes:
|
||||||
# - ./postgres:/var/lib/postgresql/data
|
# - ./postgres:/var/lib/postgresql/data
|
||||||
@ -11,6 +13,8 @@ services:
|
|||||||
redis:
|
redis:
|
||||||
restart: always
|
restart: always
|
||||||
image: redis:4.0-alpine
|
image: redis:4.0-alpine
|
||||||
|
networks:
|
||||||
|
- internal_network
|
||||||
### Uncomment to enable REDIS persistance
|
### Uncomment to enable REDIS persistance
|
||||||
# volumes:
|
# volumes:
|
||||||
# - ./redis:/data
|
# - ./redis:/data
|
||||||
@ -21,6 +25,9 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec rails s -p 3000 -b '0.0.0.0'
|
command: bundle exec rails s -p 3000 -b '0.0.0.0'
|
||||||
|
networks:
|
||||||
|
- external_network
|
||||||
|
- internal_network
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -37,6 +44,9 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: npm run start
|
command: npm run start
|
||||||
|
networks:
|
||||||
|
- external_network
|
||||||
|
- internal_network
|
||||||
ports:
|
ports:
|
||||||
- "4000:4000"
|
- "4000:4000"
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -52,6 +62,14 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
networks:
|
||||||
|
- external_network
|
||||||
|
- internal_network
|
||||||
volumes:
|
volumes:
|
||||||
- ./public/packs:/mastodon/public/packs
|
- ./public/packs:/mastodon/public/packs
|
||||||
- ./public/system:/mastodon/public/system
|
- ./public/system:/mastodon/public/system
|
||||||
|
|
||||||
|
networks:
|
||||||
|
external_network:
|
||||||
|
internal_network:
|
||||||
|
internal: true
|
||||||
|
@ -9,7 +9,7 @@ end
|
|||||||
|
|
||||||
namespace :assets do
|
namespace :assets do
|
||||||
desc 'Generate static pages'
|
desc 'Generate static pages'
|
||||||
task :generate_static_pages do
|
task generate_static_pages: :environment do
|
||||||
render_static_page 'errors/500', layout: 'error', dest: Rails.root.join('public', 'assets', '500.html')
|
render_static_page 'errors/500', layout: 'error', dest: Rails.root.join('public', 'assets', '500.html')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user