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

..

snippets

Fix for Snippets with a project

2015-05-26 15:48:32 -04:00

_choose_group_avatar_button.html.haml

Refactor buttons

2015-03-14 00:29:32 -07:00

_clone_panel.html.haml

Move project visibility from clone bar to repository details block for non empty project.

2015-05-08 18:12:07 +02:00

_commit_message_container.html.haml

Factor commit message textareas.

2014-10-02 12:03:30 +02:00

_confirm_modal.html.haml

ConfirmDangerModal window added. It will be used for confirmation of dangerous actions

2014-10-08 13:56:57 +03:00

_event_filter.html.haml

Move activity feed buttons out of event_filter into actual show views.

2015-04-23 17:11:38 +02:00

_field.html.haml

added fieldset support to project and admin services views.

2015-04-22 20:04:03 +03:00

_file_highlight.html.haml

Fix code rendering for snippets

2015-02-17 00:16:28 -08:00

_git_hooks_form.html.haml

git hook refactoring

2015-03-26 13:38:26 +02:00

_group_form.html.haml

Improve group rename warning

2015-03-18 20:16:36 -07:00

_group_tips.html.haml

Factor group tips

2014-10-20 23:43:51 +02:00

_issuable_filter.html.haml

Add Accepted and Rejected tabs to MR lists.

2015-05-25 17:01:27 +02:00

_issuable_search_form.html.haml

Implement merge requests search

2015-03-12 16:20:58 -07:00

_issues.html.haml

Upgrade to Rails 4.1.9

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

_merge_requests.html.haml

Upgrade to Rails 4.1.9

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

_milestones_filter.html.haml

Prettify milestones page

2015-02-19 15:56:23 -08:00

_no_password.html.haml

LDAP users don't need to set a password to Git over HTTP.

2015-02-23 20:04:18 -08:00

_no_ssh.html.haml

Apply some styles from flatly theme

2015-03-07 00:28:53 -08:00

_outdated_browser.html.haml

check browser version, blacklisting outdated IE (version < 10)

2014-12-24 16:22:08 +01:00

_project.html.haml

Bust group page project list cache when namespace name or path changes.

2015-04-10 16:10:25 +02:00

_projects_list.html.haml

Improve projects list

2015-03-04 17:22:55 -08:00

_promo.html.haml

Change twitter handle from gitlabhq -> gitlab

2014-12-01 17:45:25 +01:00

_ref_switcher.html.haml

Upgrade to Rails 4.1.9

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

_service_settings.html.haml

Move service template and project service settings into a shared view

2015-04-29 07:52:27 -07:00

_show_aside.html.haml

Fix wrong placement of show-aside link

2015-04-27 00:43:02 +02:00

_sort_dropdown.html.haml

Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button

2015-03-02 15:28:22 -08:00

_visibility_level.html.haml

Add new admin settings

2015-04-26 07:48:19 -06:00

_visibility_radios.html.haml

Fix labels for project/snippet visibility selection

2015-05-16 16:09:04 -04:00