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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -07:00

..

admin

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

2015-03-11 18:41:41 -07:00

audit_events

Fix EE UI for new layout

2014-12-26 15:16:44 +02:00

dashboard

Remove projects page from dashboard

2015-03-10 16:03:37 -07:00

devise

Fix duplicating OAuth providers on login page

2015-03-03 22:22:18 -08:00

doorkeeper

Rework oauth2 feature

2014-12-25 18:35:04 +02:00

errors

Improve error page layout

2014-06-24 15:57:38 +03:00

events

Add starred projects page to dashboard

2015-03-09 14:12:03 -07:00

explore

Add project filter by visibility and tag to explore page

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

groups

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

2015-03-11 18:41:41 -07:00

help

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

2015-03-11 18:41:41 -07:00

import

Fix import status page project links for new Rails.

2015-02-26 09:50:43 +01:00

kaminari/gitlab

Migrate forms and inputs pt1

2013-12-31 02:50:36 +02:00

layouts

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

2015-03-11 18:41:41 -07:00

ldap_group_links

Prevent 500 error on ldap group links page

2014-12-08 15:58:01 +02:00

notify

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

2015-03-11 18:41:41 -07:00

profiles

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

2015-03-11 18:41:41 -07:00

projects

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

2015-03-11 18:41:41 -07:00

search

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

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

shared

Apply some styles from flatly theme

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

snippets

Update path helper references

2015-02-19 21:25:28 -07:00

unsubscribes

Use base 64 encoding for email params.

2014-08-22 10:51:33 +02:00

users

Added a link_to for the LinkedIn portion of the user's profile. It felt odd to me, having this section not being an active link like the rest of the entries on the page.

2015-03-10 11:07:31 -04:00

votes

Fix votes block. twbs3 progress bars

2014-01-01 22:59:06 +02:00