andela / strikers-ah-backend

79%

develop: 82%

LAST BUILD ON BRANCH ft-logout-164489782

branch: ft-logout-164489782

CHANGE BRANCH

x

Reset

• ft-logout-164489782
• bg-display-article-image-reporting-166842273
• bg-fix-comment-update-and-likescount
• bg-fix-delete-comment-bug-166436456
• bg-fix-highlight-comment-166695560
• bg-fix-mail-helper-166183492
• bg-fix-search-by-tag-166844591
• bg-fix-social-login-duplicate-email-166974705
• bg-see-unread-notifications-166815539
• bug-165764436-test-fix
• ch-add-cors-166163174
• ch-add-fields-on-fetch-article-166694856
• ch-decode-token-165631407
• ch-document-api-164489784
• ch-fix-comment-ordering
• ch-fixing-coveralls-165120272
• ch-include-verify-in-token
• ch-reading-stats-fix-response
• ch-refactor-search-functionality-166796822
• ch-refactoring
• ch-solving-update-article-issue
• develop
• ft-164489767-login-html-css-view
• ft-164489767-login-with-page-html
• ft-164489767-request-password-html-css
• ft-164489783-reset-password-via-email
• ft-164489792-following-user
• ft-164489792-get-followers
• ft-164489792-get-user-followers
• ft-164489792-user-follow-each
• ft-164489792-user-should-follow-each-other
• ft-164489793-article-notifications
• ft-164489793-fetch-notifications
• ft-164489793-user-notification
• ft-164489793-user-notification-settings
• ft-164489793-user-notifications
• ft-164489793-user-reset-password-notification
• ft-164489793-user-should-be-able-opt-out-of-notifications
• ft-165378303-fix-travis-test
• ft-article-pagination-support-164489795
• ft-article-reading-stats-164489804
• ft-article-schema-164489786
• ft-assign-roles-to-users-165594554
• ft-associate-user-and-article-164489786
• ft-categorize-article-164489794
• ft-comment-on-article-164489790
• ft-create-article-html-css-164489786
• ft-delete-article-164489786
• ft-document-user-should-receive-ajwt-token-on-successfull-registration-164489779
• ft-fetch-article-rating-164489788
• ft-fetch-avg-rating-164489749
• ft-fetch-latest-articles-166524001
• ft-get-All-articles-164489786
• ft-get-bookmarked-articles-166405806
• ft-get-one-article-164489786
• ft-get-user-articles-166613958
• ft-get-user-profile-164489785
• ft-getOne-article-164489786
• ft-landing-page-164489767
• ft-like-unlike-comment-164489802
• ft-list-users-164489796
• ft-login-signup-with-email-164489784
• ft-login-with-twitter-164489784
• ft-login-with-twitter-and-github-164489784
• ft-make-landing-page-responsive-165409220
• ft-pagination-support-article-rating-164489789
• ft-pagination-support-article-ratings-164489789
• ft-rate-article-164489787
• ft-refactor-merge-errors
• ft-refactor-rebase-errors
• ft-report-an-article-164489801
• ft-report-article-164489801
• ft-role-based-access-164489805
• ft-routes-migration-test-articles-164489786
• ft-search-and-filtering-164489797
• ft-send-verification-email-164489780
• ft-swagger-document-twitter-github-signup-164489784
• ft-track-comment-edit-history-164489807
• ft-update-article-164489786
• ft-user-create-article-164489786
• ft-user-should-able-to-highlight-and-comment-on-text-in-article-164489806
• ft-user-should-be-able-to-like-or-dislike-an-article-164489791
• ft-user-should-be-able-to-see-the-time-it-takes-to-read-an-article-164489798
• ft-user-should-bookmark-article-164489800
• ft-user-should-create-article-164489786
• ft-user-should-see-article-read-time-16448979
• ft-users-should-be-able-to-create-their-profiles-164489785
• ft-users-should-create-articles--164489786
• ft-users-should-create-articles-164489786
• ft-users-should-create-articles-CRUD-164489786
• ghpages
• revert-71-ft-164489793-fetch-notifications

Resolve conflicts in index.js, user.js, helpers file