Skip to content

Add multiple branches configuation #110

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

Merged
merged 19 commits into from
Oct 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7efd38e
Add multiple branches configuation
andreslucena Oct 20, 2022
289359a
Add start_page with version v0.27
andreslucena Oct 20, 2022
73aafaf
Remove unused YAML anchor
andreslucena Oct 20, 2022
200efba
Add current working directory on Antora configuration
andreslucena Oct 20, 2022
eb0a901
Update Code of Conduct to same version as decidim
andreslucena Oct 26, 2022
b33f71b
Extract Netlify redirections to file
andreslucena Oct 28, 2022
18cad55
Remove build commands from Netlify configuration file
andreslucena Oct 28, 2022
ef6792d
Bump node from 14.9.0 to 16.14.2
andreslucena Oct 28, 2022
6506bba
Remove deploy-preview deprecated onliner
andreslucena Oct 28, 2022
90d2040
Simplify antora configuation for troubleshooting bad deploy
andreslucena Oct 28, 2022
1282eb3
Simplify antora configuation for troubleshooting bad deploy
andreslucena Oct 28, 2022
f486144
Enable one release in Antora configuration
andreslucena Oct 28, 2022
a19ba27
Enable decidim repository in Antora configuration
andreslucena Oct 28, 2022
015f8c8
Enable develop branch in Antora configuration
andreslucena Oct 28, 2022
b741851
Enable decidim-bulletin-board repository in Antora configuration
andreslucena Oct 28, 2022
60f3105
Enable develop branch for decidim repository in Antora configuration
andreslucena Oct 28, 2022
80a0656
Use this same repository in Antora configuration
andreslucena Oct 28, 2022
0a4d6a6
Add documentation repository URL on Antora configuration
andreslucena Oct 28, 2022
86a0116
Bump npm packages versions
andreslucena Oct 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.9.0
16.14.2
1 change: 0 additions & 1 deletion .tool-versions

This file was deleted.

87 changes: 30 additions & 57 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,76 +1,49 @@
# Contributor Covenant Code of Conduct
# Contributor Code of Conduct

## Our Pledge
As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
contribute through reporting issues, posting feature requests, updating
documentation, submitting pull requests or patches, and other activities.

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
We are committed to making participation in this project a harassment-free
experience for everyone, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal appearance,
body size, race, ethnicity, age, religion, or nationality.

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or unprofessional conduct

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope
By adopting this Code of Conduct, project maintainers commit themselves to
fairly and consistently applying these principles to every aspect of managing
this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement
This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at hola@decidim.org. All
reported by contacting a project maintainer at hola@decidim.org. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.

[homepage]: https://www.contributor-covenant.org
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/3/0/
16 changes: 11 additions & 5 deletions antora-playbook.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
site:
title: Decidim Docs
url: https://docs.decidim.org
start_page: master@en:ROOT:index.adoc
start_page: v0.27@en:ROOT:index.adoc
content:
sources:
- url: &landing .
start_path: /en
branches: master
- url: https://github.com/decidim/documentation
start_path: en
branches:
- release/0.27-stable
- release/0.26-stable
- develop
edit_url: "https://github.com/decidim/documentation/edit/{refname}/{path}"
- url: https://github.com/decidim/decidim
start_path: docs
branches: develop
branches:
- release/0.27-stable
- release/0.26-stable
- develop
- url: https://github.com/decidim/decidim-bulletin-board
start_path: docs
branches: develop
Expand Down
2 changes: 1 addition & 1 deletion en/antora.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: en
title: "Decidim Documentation"
version: master
version: develop
asciidoc:
attributes:
page-lang: en@
Expand Down
53 changes: 1 addition & 52 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,57 +1,6 @@
[build]
publish = "build/site/"
command = "npm run build"

[build.environment]
NODE_VERSION = "14"
NODE_VERSION = "16.14.2"
BUILD_ONLY = "true"
ANTORA_CACHE_DIR = "node_modules/.cache/antora"
DOCSEARCH_ENABLED = "true"
DOCSEARCH_ENGINE = "lunr"

[context.deploy-preview]
command = "sed -i'' -e 's;branches: master;branches: HEAD;g' antora-playbook.yml && npm run build"

[[redirects]]
from = "/social-contract/en/*"
to = "/en/understand/social-contract/"

[[redirects]]
from = "/features/en/*"
to = "/en/features/:splat"

[[redirects]]
from = "/features/es/*"
to = "/en/features/:splat"

[[redirects]]
from = "/features/ca/*"
to = "/en/features/:splat"

[[redirects]]
from = "/features/"
to = "/en/features/general-description/"

[[redirects]]
from = "/whitepaper/en/*"
to = "/en/whitepaper/"

[[redirects]]
from = "/deploy-and-admin/en/get-decidim/"
to = "/en/install/"

[[redirects]]
from = "/admin-manual/en/*"
to = "/en/admin/:splat"

[[redirects]]
from = "/develop/en/"
to = "/en/develop/guide/"

[[redirects]]
from = "/develop/en/advanced/*"
to = "/en/develop/:splat"

[[redirects]]
from = "/init/en/"
to = "/en/"
Loading