Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into 3220-anonymous-user…
…-should-be-redirected-to-login-page-when-trying-to-access-dashboard-instead-of-404
- Loading branch information
Showing
600 changed files
with
46,570 additions
and
48,438 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# EditorConfig http://EditorConfig.org | ||
|
||
# Project Root | ||
root = true | ||
|
||
# Default Code Style | ||
[*] | ||
charset = utf-8 | ||
end_of_line = lf | ||
indent_size = 2 | ||
indent_style = space | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
|
||
# Python Code Style | ||
[*.py] | ||
indent_size = 4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
*.po -diff | ||
#*.po -diff | ||
*.mo -diff |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
sudo: required | ||
|
||
language: python | ||
|
||
services: | ||
- docker | ||
|
||
cache: | ||
directories: | ||
- ~/docker | ||
|
||
before_install: | ||
- if [[ -e ~/docker/postgresql.tar ]]; then docker load -i ~/docker/postgresql.tar; fi | ||
- if [[ -e ~/docker/solr.tar ]]; then docker load -i ~/docker/solr.tar; fi | ||
- if [[ -e ~/docker/redis.tar ]]; then docker load -i ~/docker/redis.tar; fi | ||
- if [[ -e ~/docker/ckan.tar ]]; then docker load -i ~/docker/ckan.tar; fi | ||
|
||
- docker build --rm=false -t postgresql ./contrib/docker/postgresql/ | ||
- docker build --rm=false -t solr ./contrib/docker/solr/ | ||
- docker pull redis:latest | ||
- docker build --rm=false -t ckan . | ||
|
||
- mkdir -p ~/docker; docker save postgresql > ~/docker/postgresql.tar | ||
- mkdir -p ~/docker; docker save solr > ~/docker/solr.tar | ||
- mkdir -p ~/docker; docker save redis:latest > ~/docker/redis.tar | ||
- mkdir -p ~/docker; docker save ckan > ~/docker/ckan.tar | ||
|
||
install: | ||
- docker run -d --name db postgresql | ||
- docker run -d --name solr solr | ||
- docker run -d --name redis redis:latest | ||
- docker run -d --name ckan -p 5000:5000 --link db:db --link redis:redis --link solr:solr ckan | ||
|
||
script: | ||
- docker ps -a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.