Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

Finalize new URL #373

Merged
merged 7 commits into from
Apr 8, 2015
Merged

Finalize new URL #373

merged 7 commits into from
Apr 8, 2015

Conversation

konklone
Copy link
Contributor

@konklone konklone commented Oct 2, 2014

Finishes the process #216 started, to update the site to point to the new URL.

  • Updated _config.yml to change the site URL to be https://project-open-data.cio.gov
  • Adds a rel=canonical link tag to point search engines et al to https://project-open-data.cio.gov/
  • Any links that pointed to the old URL have now been changed to relative paths

A repo administrator still needs to update the URL visible at the top of the repo page to point to https://project-open-data.cio.gov/.

@gbinal
Copy link
Contributor

gbinal commented Oct 2, 2014

@philipashlock, @haleyvandyck, @rebeccawilliams - I'm good with our going ahead with all this. You?

@rebeccawilliams
Copy link
Contributor

👍

@gbinal
Copy link
Contributor

gbinal commented Feb 3, 2015

@philipashlock - game to confirm whether we should merge this?

Conflicts:
	_config.yml
	_includes/header.html
	implementation-guide.md
	policy-docs.md
	schema.md
@konklone
Copy link
Contributor Author

konklone commented Feb 3, 2015

I just updated my PR to deal with merge conflicts so that it's merge-ready. It looks like most of them are because my editor strips out trailing whitespace, which conflicted with others' future edits to those paragraphs.

Conflicts:
	_config.yml
	schema.md
@konklone
Copy link
Contributor Author

I've updated my PR and fixed merge conflicts.

It may be easiest to review my PR by looking at it with whitespace stripping removed: https://github.com/project-open-data/project-open-data.github.io/pull/373/files?w=1

@gbinal
Copy link
Contributor

gbinal commented Apr 7, 2015

So..... funny story.

There are merge conflicts again. We're all currently within 30 feet of each other. Want to get in the same place and finally see this one out?

@konklone
Copy link
Contributor Author

konklone commented Apr 7, 2015

OK, I resolved the merge conflict. It required me to remove the line below this one, since license-examples has been removed. I also identified and fixed a merge conflict I failed to resolve last time.

How about a merge? 😺

@konklone
Copy link
Contributor Author

konklone commented Apr 7, 2015

Oh, and this is the best diff URL to review my changes:

https://github.com/project-open-data/project-open-data.github.io/pull/373/files?w=1

It omits changes that are only whitespace, leaving only the substantive changes in this PR.

@gbinal
Copy link
Contributor

gbinal commented Apr 8, 2015

Great - thanks a bunch and sorry for the hassle. I'm going to go ahead and merge.

gbinal added a commit that referenced this pull request Apr 8, 2015
@gbinal gbinal merged commit 8b29ccc into project-open-data:master Apr 8, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants