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

..

appearances_helper.rb

Fix tests

2015-03-03 22:04:25 -08:00

application_helper.rb

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

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

application_settings_helper.rb

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

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

audit_events_helper.rb

Create an audit events overview on the project settings page.

2014-11-19 16:18:30 +01:00

blob_helper.rb

Fix git blame syntax highlighting when different commits break up lines

2015-05-27 14:10:58 -07:00

branches_helper.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-25 09:16:09 -07:00

broadcast_messages_helper.rb

Customization and previewing of broadcast messages

2013-12-18 17:43:45 -05:00

commits_helper.rb

Add Commit#author and #committer.

2015-04-02 10:57:01 +02:00

compare_helper.rb

Improve create_mr_button? performance.

2015-05-09 23:51:50 +02:00

dashboard_helper.rb

Add project filter by visibility and tag to explore page

2015-03-10 15:59:14 -07:00

diff_helper.rb

Disabled expansion of top/bottom blobs for new file diffs

2015-05-21 09:25:07 +02:00

emails_helper.rb

Fill in email on the new password form

2015-05-16 14:03:18 -06:00

events_helper.rb

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2015-05-15 12:59:44 +03:00

explore_helper.rb

Add project filter by visibility and tag to explore page

2015-03-10 15:59:14 -07:00

external_wiki_helper.rb

Add a service to support external wikis

2015-03-12 19:13:51 +01:00

git_helper.rb

Hide gpg signature on tags page from tag message

2014-11-18 18:00:38 +02:00

gitlab_markdown_helper.rb

Actually ignore references in code blocks etc.

2015-06-02 13:17:11 +02:00

gitlab_routing_helper.rb

Better looking milestone lists

2015-04-01 02:45:47 +03:00

graph_helper.rb

Append in place for strings and arrays

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

groups_helper.rb

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

2015-05-05 10:18:27 +02:00

icons_helper.rb

Restructure project sidebar.

2015-05-12 10:27:17 +02:00

issues_helper.rb

Remove title_for_issue helper

2015-04-30 17:27:33 -04:00

labels_helper.rb

Add link_to_label helper

2015-05-21 23:40:25 -04:00

license_helper.rb

Show prettier error message when license file is invalid.

2015-05-05 11:49:28 +02:00

merge_requests_helper.rb

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

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

milestones_helper.rb

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

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

namespaces_helper.rb

Prevent database query each time we render group avatar

2015-03-12 13:56:53 -07:00

nav_helper.rb

Fix toggle of sidebar

2015-04-22 16:48:39 +03:00

notes_helper.rb

Don't add js-task-list-container to things the user can't edit

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

notifications_helper.rb

Use icon helper method in helper modules

2015-01-28 03:48:18 -05:00

oauth_helper.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-21 20:41:10 -07:00

page_layout_helper.rb

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

profile_helper.rb

Restyle oauth accounts at profile page and add ability to unlink account

2015-03-21 17:46:00 -07:00

projects_helper.rb

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

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

search_helper.rb

Update views to single form of address. Change "my" to "your"

2015-03-22 20:10:12 -07:00

selects_helper.rb

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

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

snippets_helper.rb

Upgrade to Rails 4.1.9

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

sorting_helper.rb

Refactor sorting in project

2015-02-05 19:15:05 -08:00

submodule_helper.rb

Fix "Revspec not found" errors when viewing diffs in a forked project with submodules

2015-04-27 20:42:38 -07:00

tab_helper.rb

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

2015-03-16 21:25:00 -07:00

tags_helper.rb

Append in place for strings and arrays

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

tree_helper.rb

Simplify and unify helpers for rendering markup

2015-05-18 22:52:13 +02:00

version_check_helper.rb

Enable version check only for production environment

2015-05-11 18:23:40 +03:00

visibility_level_helper.rb

Add period at snippet visibilty description

2015-05-03 15:00:46 +02:00

wiki_helper.rb

Fix Error 500 when searching Wiki pages

2015-04-30 08:54:08 -07:00