Dmitriy Zaporozhets 73e003013f Merge branch 'master' into admin-edit-identities ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml

2015-06-22 18:00:11 +02:00

..

admin

Fix indendity test

2015-06-22 17:52:22 +02:00

dashboard

Fix tests for group leave feature

2015-05-29 15:07:04 +02:00

explore

Fix spinach tests

2014-12-24 14:34:37 +02:00

profile

Move the "Design" templates and logic to Preferences

2015-06-13 17:58:16 -04:00

project

Merge branch 'revert-mr-state-names'

2015-06-22 15:43:09 +02:00

snippets

Fix Error 500 when one user attempts to access a personal, internal snippet

2015-06-19 21:23:46 -07:00

steps

Merge branch 'master' into admin-edit-identities

2015-06-22 18:00:11 +02:00

support

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

groups.feature

Add feature tests for inviting members.

2015-04-14 12:08:11 +02:00

invites.feature

Add spinach tests around accepting and declining invitations.

2015-04-14 18:04:29 +02:00

search.feature

Fix Error 500 when searching Wiki pages

2015-04-30 08:54:08 -07:00

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Refactor contributions events and write tests for calendar

2015-03-22 13:55:00 -07:00