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

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

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb

2015-04-15 19:22:57 +03:00

..

commits

Fix code unfold not working on Compare commits page

2015-03-24 00:19:41 -07:00

issues

Move current user to the top of the list in author/assignee filters

2015-04-09 01:04:53 -07:00

source

Fix tests.

2015-03-27 11:10:56 +01:00

active_tab.rb

Fix active tab tests

2015-02-19 17:24:34 -08:00

archived.rb

Upgrade to Rails 4.1.9

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

audit_event.rb

deploy key events: tests

2015-03-24 15:58:02 +02:00

create.rb

Upgrade to Rails 4.1.9

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

deploy_keys.rb

Add project deploy keys tests.

2015-04-03 12:40:14 +02:00

fork.rb

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

forked_merge_requests.rb

Upgrade to Rails 4.1.9

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

git_hooks.rb

Git hooks for checking email

2014-10-29 11:42:51 +02:00

graph.rb

Spelling change Commit Statistics

2015-03-03 20:38:42 -08:00

hooks.rb

Upgrade to Rails 4.1.9

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

merge_requests.rb

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

2015-04-15 19:22:57 +03:00

network_graph.rb

Upgrade to Rails 4.1.9

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

project_group_links.rb

Update path helpers and routes for Rails 4.1.9

2015-02-27 18:21:15 -07:00

project_shortcuts.rb

Prefix Spinach features with Spinach::Features::.

2014-09-22 16:30:25 +02:00

project.rb

Fix project memeber management

2015-03-17 09:22:41 -07:00

redirects.rb

Upgrade to Rails 4.1.9

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

services.rb

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

2015-03-02 16:10:12 -08:00

snippets.rb

Upgrade to Rails 4.1.9

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

star.rb

Refactor star btn logic for non-logged in user and fix tests

2015-03-29 18:50:45 -07:00

team_management.rb

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

2015-04-15 19:22:57 +03:00

wiki.rb

Fix bug where Wiki pages that include a '/' were no longer accessible

2015-04-07 09:10:11 -07:00