Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 ...

Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml

2015-02-21 12:55:28 -07:00

..

backend

Updated rspec to rspec 3.x syntax

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

diff

Updated rspec to rspec 3.x syntax

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

github

Updated rspec to rspec 3.x syntax

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

gitlab_import

Updated rspec to rspec 3.x syntax

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

gitorious_import

Add gitorious.org importer

2015-02-20 17:42:58 +00:00

ldap

Updated rspec to rspec 3.x syntax

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

oauth

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-02-12 16:47:52 -08:00

satellite

Updated rspec to rspec 3.x syntax

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

auth_spec.rb

Session API: Use case-insensitive authentication like in UI

2014-10-30 18:29:18 +02:00

closing_issue_extractor_spec.rb

Updated rspec to rspec 3.x syntax

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

git_access_spec.rb

Updated rspec to rspec 3.x syntax

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

git_access_wiki_spec.rb

Updated rspec to rspec 3.x syntax

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

gitlab_markdown_helper_spec.rb

Updated rspec to rspec 3.x syntax

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

popen_spec.rb

Updated rspec to rspec 3.x syntax

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

push_data_builder_spec.rb

Extend project web hooks with more data

2015-02-20 10:27:37 -08:00

reference_extractor_spec.rb

Updated rspec to rspec 3.x syntax

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

regex_spec.rb

Updated rspec to rspec 3.x syntax

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

upgrader_spec.rb

Updated rspec to rspec 3.x syntax

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

url_builder_spec.rb

Upgrade to Rails 4.1.9

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

version_info_spec.rb

Updated rspec to rspec 3.x syntax

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