Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee ...

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

2015-02-04 18:19:22 -08:00

..

application_helper_spec.rb

Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable

2015-01-24 18:51:16 +01:00

broadcast_messages_helper_spec.rb

Customization and previewing of broadcast messages

2013-12-18 17:43:45 -05:00

diff_helper_spec.rb

Fix diff_helper spec.

2014-09-12 21:02:50 +02:00

events_helper_spec.rb

Fixed tests

2015-01-15 14:01:12 +01:00

gitlab_markdown_helper_spec.rb

Add missing end in group.rb

2015-01-29 14:14:43 -08:00

issues_helper_spec.rb

Update rspec tests to the new external issue logic.

2015-01-26 15:59:40 -08:00

labels_helper_spec.rb

Fix old api compatibility and tests

2014-07-30 17:17:29 +03:00

merge_request_helper_spec.rb

removes api credentials from link to build_page

2014-06-11 12:41:14 +02:00

merge_requests_helper.rb

Add a test for issue sentence generation

2014-06-13 18:10:28 +02:00

nav_helper_spec.rb

Adds persistent collapse button for left side bar

2015-02-03 11:45:33 -05:00

notifications_helper_spec.rb

Fix specs for icons

2015-01-30 00:22:51 -08:00

oauth_helper_spec.rb

Kerberos: specs

2014-12-15 18:06:17 +02:00

projects_helper_spec.rb

Update rspec tests to the new external issue logic.

2015-01-26 15:59:40 -08:00

search_helper_spec.rb

Make changes to tests

2014-01-22 21:03:52 +02:00

submodule_helper_spec.rb

Fix failing submodule test.

2014-06-03 11:37:23 +02:00

tab_helper_spec.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

tree_helper_spec.rb

point to a specific branch in the test repo to avoid conflicts

2015-01-11 05:07:34 +01:00