Skip to content

Commit

Permalink
Merge pull request #188 from Code-dot-mil/fix-links
Browse files Browse the repository at this point in the history
I'm YOLO committing this because it's an easy win and semi-urgent @jordangov
  • Loading branch information
arichiv-usds authored Apr 1, 2018
2 parents 32b2954 + f99583c commit 956551a
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<!--
Please:
* Clearly and concisely name your issue
* Search for duplicate issues https://github.com/deptofdefense/code.mil/issues
* Search for duplicate issues https://github.com/Code-dot-mil/code.mil/issues
* Split different bugs/features into different issues
-->
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
Please:
* Clearly and concisely name your PR
* Split different bugs/features into different PRs
* Ask deptofdefense/code-mil for review
* Ask Code-dot-mil/code-mil for review
* Ensure the checks pass before asking for review
-->
4 changes: 2 additions & 2 deletions .github/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Welcome to Code.mil

[![Build Status](https://travis-ci.org/deptofdefense/code.mil.svg)](https://travis-ci.org/deptofdefense/code.mil)
[![Build Status](https://travis-ci.org/Code-dot-mil/code.mil.svg)](https://travis-ci.org/Code-dot-mil/code.mil)

An experiment in open source at the Department of Defense.

Expand All @@ -24,4 +24,4 @@ We need your help in contributing to our projects to build better products and s

We've drafted documentation on [implementing OSS within the DoD](http://www.code.mil/getting-started.html) and a guideline for [accepting contributions to DoD OSS projects](http://www.code.mil/how-to-open-source.html#step-4-contributions) so the DoD can participate in the open source and free software communities, even where we may not have copyright. This lets us harness the depth and breadth of talent in the open source and free software communities to improve our software and make our code available for public use.

We want your help to continue making our open source strategy better. Our philosophy is continuous iteration. We encourage everybody to [open an issue](https://github.com/deptofdefense/code.mil/issues/new) (or a pull request!) with your suggestions on how to continue improving.
We want your help to continue making our open source strategy better. Our philosophy is continuous iteration. We encourage everybody to [open an issue](https://github.com/Code-dot-mil/code.mil/issues/new) (or a pull request!) with your suggestions on how to continue improving.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Your bug fix or feature addition won't be rejected if it runs afoul of any (or a

## Submitting an Issue

You should feel free to [submit an issue](https://github.com/deptofdefense/code.mil/issues) on our GitHub repository for anything you feel needs attention on the site. That includes content, functionality, design, or anything else!
You should feel free to [submit an issue](https://github.com/Code-dot-mil/code.mil/issues) on our GitHub repository for anything you feel needs attention on the site. That includes content, functionality, design, or anything else!

### Submitting a Bug

Expand All @@ -127,11 +127,11 @@ When submitting a bug on the site please be sure to add extensive information ab

## Submitting Code

When making your changes, it is highly encouraged that you use a [branch in Git](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging), then submit a [Pull Request (PR)](https://github.com/deptofdefense/move.mil/pulls) on GitHub. Your request will go through some automated checks using [Travis CI](https://travis-ci.org/deptofdefense/code.mil/), a continuous integration and deployment tool.
When making your changes, it is highly encouraged that you use a [branch in Git](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging), then submit a [Pull Request (PR)](https://github.com/Code-dot-mil/code.mil/pulls) on GitHub. Your request will go through some automated checks using [Travis CI](https://travis-ci.org/Code-dot-mil/code.mil/), a continuous integration and deployment tool.

After review by the Code.mil team your PR will either be commented on with a request for more information or changes, or it will be merged into the codebase which will automatically deploy the changes to [beta.code.mil](http://beta.code.mil).

Assuming everything checks out, the Code.mil team will deploy the changes to [code.mil](http://code.mil) by creating a [new release](https://github.com/deptofdefense/code.mil/releases/new) on master with a tag like vX.X.X (where X is between 0 and 9), human readable title, and any other relevent context in the description.
Assuming everything checks out, the Code.mil team will deploy the changes to [code.mil](http://code.mil) by creating a [new release](https://github.com/Code-dot-mil/code.mil/releases/new) on master with a tag like vX.X.X (where X is between 0 and 9), human readable title, and any other relevent context in the description.

### Check Your Changes

Expand Down
2 changes: 1 addition & 1 deletion _data/footer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ contact:
href: https://twitter.com/DefenseDigital
external: true
- text: <span class='usa-link-github usa-social_link' title='GitHub'><span>GitHub</span></span>
href: https://github.com/DeptOfDefense/code.mil
href: https://github.com/Code-dot-mil/code.mil
external: true
- text: <span class='usa-link-medium usa-social_link' title='Medium'><span>Medium</span></span>
href: https://medium.com/defense-digital-service
Expand Down
2 changes: 1 addition & 1 deletion _pages/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ graphics:
src: /assets/images/arrow-right-white.png
alt: 'arrow right'
title: Connect with us.
description: We believe that software created by the government should be shared with the public, and we want to collaborate with civic-minded peers to make this happen. Reach out to us to start the discussion!<br><a href='mailto:{{site.email}}' class='usa-button usa-button-small'>{{site.email}}</a> <a href='https://github.com/DeptOfDefense/code.mil' class='usa-button usa-button-small'>Check us out on GitHub</a>
description: We believe that software created by the government should be shared with the public, and we want to collaborate with civic-minded peers to make this happen. Reach out to us to start the discussion!<br><a href='mailto:{{site.email}}' class='usa-button usa-button-small'>{{site.email}}</a> <a href='https://github.com/Code-dot-mil/code.mil' class='usa-button usa-button-small'>Check us out on GitHub</a>
- image:
src: /assets/images/arrow-right-white.png
alt: 'arrow right'
Expand Down
4 changes: 2 additions & 2 deletions code.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@
"status": "Production",
"vcs": "git",
"languages": ["HTML", "CSS", "JavaScript"],
"repositoryURL": "https://github.com/deptofdefense/code.mil",
"repositoryURL": "https://github.com/Code-dot-mil/code.mil",
"permissions": {
"licenses": [
{
"URL": "https://github.com/deptofdefense/code.mil/blob/master/LICENSE.md",
"URL": "https://github.com/Code-dot-mil/code.mil/blob/master/LICENSE.md",
"name": "MIT"
}
],
Expand Down

0 comments on commit 956551a

Please sign in to comment.