Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ...

# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb

2016-03-21 23:22:21 +01:00

..

application_helper_spec.rb

Revert "Merge branch 'avatar-cropping' into 'master' "

2016-03-15 14:55:40 +01:00

auth_helper_spec.rb

Allow custom label to be set for authentication providers.

2015-07-23 15:20:12 +02:00

blob_helper_spec.rb

Refactor Gitlab::Highlight and fix tests

2016-01-19 14:52:41 +01:00

broadcast_messages_helper_spec.rb

Move BroadcastMessage#status to a helper since it's presentational

2016-01-13 11:49:59 -05:00

ci_status_helper_spec.rb

Define CI status icon colors in SCSS instead of a helper

2015-12-12 13:18:51 -05:00

diff_helper_spec.rb

Use Gitlab::Git::DiffCollections

2016-03-03 18:38:44 +01:00

emails_helper_spec.rb

Explain reset token expiration in emails

2015-05-16 14:03:07 -06:00

events_helper_spec.rb

Fix two more failing specs

2015-08-25 16:26:20 -07:00

gitlab_markdown_helper_spec.rb

Fix specs expecting emoji/ in image path

2016-02-13 14:03:07 -05:00

graph_helper_spec.rb

Remove git refs used internally by GitLab from network graph

2015-09-23 08:56:32 -07:00

groups_helper_spec.rb

Tweaks, refactoring, and specs

2016-03-20 21:04:07 +01:00

icons_helper_spec.rb

Check symlink mode as a String for file_type_icon_class

2015-04-01 23:34:33 -04:00

issues_helper_spec.rb

satisfy rubocop

2015-12-25 15:46:01 +02:00

labels_helper_spec.rb

change the css class has_tooltip to has-tooltip universally

2016-03-20 21:37:22 +01:00

merge_requests_helper_spec.rb

Move ci_build_details_path helper spec to correct location

2015-12-21 21:57:51 -05: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

Update mock and stub syntax for specs

2015-06-22 12:13:46 +02:00

page_layout_helper_spec.rb

Don't override issue page description in project layout.

2016-01-06 13:02:51 +01:00

preferences_helper_spec.rb

Add user preference to view project activity and starred project activity as default dashboard

2015-09-26 08:46:05 -07:00

projects_helper_spec.rb

Merge branch 'master' into issue_12658

2016-03-21 23:22:21 +01:00

runners_helper_spec.rb

Fix specs

2015-10-14 17:29:18 +02:00

search_helper_spec.rb

Fix broken tests

2016-02-04 17:00:32 +01:00

submodule_helper_spec.rb

Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path

2015-06-23 05:49:19 -07:00

tab_helper_spec.rb

Fix Style/SpaceInsideHashLiteralBraces cop violations

2015-06-22 14:41:00 -04:00

time_helper_spec.rb

Refactor CI helpers

2015-09-29 16:26:40 +02:00

tree_helper_spec.rb

Fix bad multi-line split from previous commit

2015-06-22 16:06:04 -04:00

visibility_level_helper_spec.rb

Improve group visibility level feature

2016-03-18 16:58:04 -03:00