Skip to content

Notes: 2015 12 21

Jump to bottom Edit New page
sabrina-ulbrich edited this page Dec 21, 2015 · 3 revisions

1. Sessions

We get on with the sessions-branch, finish and merge it.

We put all changes of sessions on the top of the master branch: git checkout sessions git rebase master

There are some conflics with the files in master, so we fix the line in this file, than git add "that file" git rebase --continue git push

Then some tests failed. Klick on the yellow square in github to check the travis results. It says three tests fail so we fix the tests by changing the admin_login helper method because we don't use the basic http authentication anymore. The same thing happens with the response message: we don't use the header for authentication infos but a redirection to the login page.

2. Tests

We check and merge the pull request #107

See the detailed merge message of Ariane: https://github.com/rubymonsters/diversity_ticketing/pull/107

Add a custom footer
Add a custom sidebar
Clone this wiki locally