Skip to content

Bug Fix and Feature Added#17

Open
kedevlin wants to merge 47 commits intoAda-C4:masterfrom
kedevlin:master
Open

Bug Fix and Feature Added#17
kedevlin wants to merge 47 commits intoAda-C4:masterfrom
kedevlin:master

Conversation

@kedevlin
Copy link

Fixed bugs and created associated tests: (1) problem clicking Categories link on dashboard, (2) flash errors not displaying upon create.

Added feature allowing admin users to merge articles. Created cucumber and rspec tests before developing feature. Feature appears to work, but there are currently 3 failing cucumber tests and 2 failing rspec tests.

Gemfile Outdated
# end
#end

gem 'pry-nav', group: [:development, :test]

Choose a reason for hiding this comment

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

Is there an existing development, test group that this gem should be added to?

Copy link
Author

Choose a reason for hiding this comment

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

moved to pre-existing group.

@kariabancroft
Copy link

you successfully excluded the db/db_test file but unfortunately the db/db_development file is still in here

@@ -1,84 +0,0 @@
class LangaugeFile

Choose a reason for hiding this comment

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

Did you intend to delete this file?

Copy link
Author

Choose a reason for hiding this comment

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

no, I accidently added it to git ignore and ran git rm --cached on it. It's now back in the app and being tracked. I added db/db_development to gitignore and it's no longer being tracked by git. I think this resolves all the issues from this PR. Thanks for the help!!

@kedevlin kedevlin changed the title Bug Fix Bug Fix and Feature Added Mar 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants