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

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

appearances_helper.rb

changes display for empty brand_logo

2014-06-16 10:50:17 +02:00

application_helper.rb

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

2014-06-17 10:53:44 +03:00

blob_helper.rb

Specify language detection for highlight.js

2014-06-07 15:46:58 +03:00

branches_helper.rb

Dont show new file link on protected branch for developers

2014-06-02 16:18:16 +03:00

broadcast_messages_helper.rb

Customization and previewing of broadcast messages

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

commits_helper.rb

Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed

2014-06-14 22:54:56 +03:00

compare_helper.rb

Fix bug with showing create merge request button while merge request are disabled in project settings

2013-12-04 11:02:36 +03:00

dashboard_helper.rb

Use FilteringService for Dashboard, Group pages

2014-01-15 16:16:45 +02:00

events_helper.rb

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

gitlab_markdown_helper.rb

Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard

2014-06-11 15:02:48 +03:00

graph_helper.rb

Remove the dependancy of grit from class Network::Graph

2013-08-20 12:05:23 +09:00

groups_helper.rb

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

icons_helper.rb

Replace ok with circle for boolean icon

2014-06-16 22:31:15 +03:00

issues_helper.rb

links to issues on main dashboard

2014-05-26 13:24:21 +00:00

labels_helper.rb

Determine label color based on lowercase name

2014-04-11 19:06:27 +02:00

merge_requests_helper.rb

Add a test for issue sentence generation

2014-06-13 18:10:28 +02:00

namespaces_helper.rb

Allow masters to create projects in groups

2014-05-28 19:04:42 +03:00

notes_helper.rb

Refactor link to new diff note rendering

2014-06-06 23:15:54 +03:00

notifications_helper.rb

Remove color-named css classes

2014-06-03 14:49:50 +03:00

oauth_helper.rb

Correct indentation in readme, fixed display of social accounts in profile

2013-05-28 18:00:44 +03:00

profile_helper.rb

Check if any social providers are enabled.

2014-03-06 21:07:02 -06:00

projects_helper.rb

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

search_helper.rb

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

selects_helper.rb

Add assignee and milestone to 2nd step

2014-05-08 15:52:59 +03:00

snippets_helper.rb

Restyle snippets

2013-06-05 22:25:27 +03:00

submodule_helper.rb

Refactor some search scopes to prevent wierd behaviour and PG::Error issues

2014-06-05 20:37:35 +03:00

tab_helper.rb

Move protected branches to Project settings

2014-05-23 14:25:55 +03:00

tags_helper.rb

1. Set Helvetica as primary font; 2. removed tabs

2011-11-09 21:26:24 +02:00

tree_helper.rb

Replace files icons with fontawesome

2014-06-03 13:40:07 +03:00

visibility_level_helper.rb

Remove color-named css classes

2014-06-03 14:49:50 +03:00