This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master in repository fedora-budget.
discards cb74c79 Fix AsciiBinder Config new dd9df75 Fix AsciiBinder Config
This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this:
* -- * -- B -- O -- O -- O (cb74c79) \ N -- N -- N refs/heads/master (dd9df75)
You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B.
Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever.
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: _builder/jenkins_builder | 5 ++--- _distro_map.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit dd9df75923a9db946c6d0cae559ce682fd5a3489 Author: Brian (bex) Exelbierd bex@pobox.com Date: Tue Jul 25 00:33:20 2017 +0200
Fix AsciiBinder Config
The newest version is more strict --- _builder/jenkins_builder | 5 ++-- _distro_map.yml | 4 +-- _topic_map.yml | 58 +++++++++++++++++++++---------------------- index.adoc => docs/index.adoc | 0 index-main.html | 8 ++++++ 5 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/_builder/jenkins_builder b/_builder/jenkins_builder index 3243d79..0dd0014 100755 --- a/_builder/jenkins_builder +++ b/_builder/jenkins_builder @@ -34,9 +34,8 @@ cd fedora-budget-site git checkout stg rm -rf * _*
-# This is silly, but we have to keep the budget directory in place in order to get the index page css working -cp -r ../../_package/main/* . -mv budget/* . +# copy over the site +cp -r ../../_package/main/budget/* .
# Commit it git add . diff --git a/_distro_map.yml b/_distro_map.yml index 4e720d1..453ca50 100644 --- a/_distro_map.yml +++ b/_distro_map.yml @@ -1,6 +1,6 @@ --- -budget: - name: +ascii_binder: + name: Fedora Budget Site author: Fedora Budget budget-devel@fedoraproject.org site: main site_name: Home diff --git a/_topic_map.yml b/_topic_map.yml index c79ac00..1147d13 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -7,7 +7,7 @@ # Dir: origin_of_the_species <= Directory name of topic group # Topics: # - Name: The Majestic Marmoset <= Topic name -# File: the_majestic_marmoset <= Topic file under group dir +/- .adoc +# File: the_majestic_marmoset <= Topic file under group dir +/- # - Name: The Curious Crocodile <= Topic 2 name # File: the_curious_crocodile <= Topic 2 file # - Name: The Numerous Nematodes <= Sub-topic group name @@ -25,74 +25,74 @@ Name: Fedora Budget FAQs Dir: docs Topics: - Name: Introduction - File: ../index.adoc + File: index - Name: Reimbursement Guidelines - File: reimbursement.adoc + File: reimbursement - Name: Flock 2017 Funding FAQ - File: flock_funding_faq.adoc + File: flock_funding_faq - Name: General Information - File: faq_general.adoc + File: faq_general - Name: Understanding Entries - File: faq_entries.adoc + File: faq_entries - Name: Understanding Budgets - File: faq_budgeting.adoc + File: faq_budgeting --- Name: FY 18 Budget Reports Dir: FY18 Topics: - Name: Introduction - File: README.adoc + File: README - Name: Overall Budget - File: overall.adoc + File: overall - Name: Diversity & Inclusion Budget - File: d-i.adoc + File: d-i - Name: Mindshare Budget - File: mindshare.adoc + File: mindshare - Name: APAC Region Budget - File: apac.adoc + File: apac - Name: EMEA Region Budget - File: emea.adoc + File: emea - Name: LATAM Region Budget - File: latam.adoc + File: latam - Name: NA Region Budget - File: na.adoc + File: na - Name: Events Budget - File: events.adoc + File: events - Name: FADs Budget - File: fads.adoc + File: fads - Name: Council and Other Expenses - File: council.adoc + File: council --- Name: FY 17 Budget Reports Dir: FY17 Topics: - Name: Introduction - File: README.adoc + File: README - Name: Overall Budget - File: overall.adoc + File: overall - Name: Diversity & Inclusion Budget - File: d-i.adoc + File: d-i - Name: APAC Region Budget - File: apac.adoc + File: apac - Name: EMEA Region Budget - File: emea.adoc + File: emea - Name: LATAM Region Budget - File: latam.adoc + File: latam - Name: NA Region Budget - File: na.adoc + File: na - Name: Events Budget - File: events.adoc + File: events - Name: FADs Budget - File: fads.adoc + File: fads --- Name: FY 16 Budget Reports Dir: FY16 Topics: - Name: Introduction - File: README.adoc + File: README --- Name: FY 15 Budget Reports Dir: FY15 Topics: - Name: Introduction - File: README.adoc + File: README diff --git a/index.adoc b/docs/index.adoc similarity index 100% rename from index.adoc rename to docs/index.adoc diff --git a/index-main.html b/index-main.html new file mode 100644 index 0000000..8fd78d9 --- /dev/null +++ b/index-main.html @@ -0,0 +1,8 @@ +<html> + <head> + <meta http-equiv="refresh" content="0; url=budget/docs/index.html" /> + </head> + <body> + <p><a href="budget/docs/index.html">Redirect</a></p> + </body> +</html>
budget-devel@lists.fedoraproject.org
-
git repository hosting