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

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

active_tab.rb

Rename dashboard landing page to Your projects

2015-03-10 16:06:30 -07:00

admin.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

authentication.rb

Add feature spec for group membership locking.

2014-12-15 10:44:34 +01:00

diff_note.rb

Change always passing visible true tests to false.

2015-01-02 00:20:19 +01:00

group.rb

Add feature spec for group membership locking.

2014-12-15 10:44:34 +01:00

issuable.rb

Revert "Fix tests"

2015-01-14 17:22:48 -08:00

markdown.rb

Remove feature tests for old task lists

2015-05-06 13:00:14 -04:00

note.rb

Remove feature tests for old task lists

2015-05-06 13:00:14 -04:00

paths.rb

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

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

project_tab.rb

Improve sidebar menu for project settings

2015-02-23 18:43:39 -08:00

project.rb

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

2015-06-05 11:40:36 +02:00

search.rb

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

shortcuts.rb

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

snippet.rb

fix for public snippet

2014-10-24 12:52:59 +03:00

user.rb

Move destroy user feature to spec.

2014-07-17 23:22:40 +02:00