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

Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb

2015-05-13 14:10:14 +03:00

..

admin

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

atom

Merge branch 'atom-xhtml-squashed' into 'master'

2015-03-17 08:38:38 +00:00

security

Test license blocking changes.

2015-05-05 13:20:40 +02:00

gitlab_flavored_markdown_spec.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

help_pages_spec.rb

Re-fix image rendering for help pages

2015-04-15 12:45:31 -04:00

issues_spec.rb

Group milestones by title in the dashboard and all other issue views

2015-05-01 01:12:58 +02:00

login_spec.rb

Handle password reset for users with 2FA enabled

2015-05-11 14:31:31 -04:00

markdown_spec.rb

Remove class and id attributes from SanitizationFilter whitelist

2015-05-08 12:31:34 -04:00

notes_on_merge_requests_spec.rb

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

password_reset_spec.rb

Handle password reset for users with 2FA enabled

2015-05-11 14:31:31 -04:00

profile_spec.rb

Even more hound fixes

2015-02-12 21:00:55 +01:00

projects_spec.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

search_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

task_lists_spec.rb

Change wording for task list summaries

2015-05-06 17:27:10 -04:00

users_spec.rb

Specs don't need to set default_url_options anymore

2015-04-27 15:47:05 -04:00