Skip to content
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

change CHANGES to CHANGELOG.md #1043

Merged
merged 2 commits into from
Oct 29, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions CHANGES → CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
= Upcoming Release

* Correctly handle encoded colons in routes. (Jeremy Evans)
* Rename CHANGE to Changelog.md and update Rakefile. (Eliza Sorensen)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Zemmiph0bia Should probably make sure the filename's casing matches.

* Your contribution here.

= 1.4.6 / 2015-03-23
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ can be applied as quickly as possible:
modify the `README.md` file to reflect that. Again, if you don't
update the `README`, we have to, and this holds up acceptance.

4. **Update the change log (`CHANGES`):** The change log helps give an
4. **Update the change log (`CHANGELOG.md`):** The change log helps give an
overview of the changes that go into each release, and gives credit
where credit is due. We make sure that the change log is up to date
before each release, and we always appreciate it when people make
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ if defined?(Gem)
end

task 'release' => ['test', package('.gem')] do
if File.binread("CHANGES") =~ /= \d\.\d\.\d . not yet released$/i
fail 'please update changes first' unless %x{git symbolic-ref HEAD} == "refs/heads/prerelease\n"
if File.binread("CHANGELOG.md") =~ /= \d\.\d\.\d . not yet released$/i
fail 'please update the changelog first' unless %x{git symbolic-ref HEAD} == "refs/heads/prerelease\n"
end

sh <<-SH
Expand Down