Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb

2015-01-29 11:34:43 -08:00

..

admin

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

audit_events

Fix EE UI for new layout

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

dashboard

Predefine colors for project identicons

2015-01-24 22:03:30 -08:00

devise

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

2015-01-21 17:05:31 -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 a commit calendar to the user profile

2015-01-29 01:25:26 +01:00

explore

Create helper for sort drowdown option names

2014-12-04 12:10:38 +02:00

github_imports

Github Importer: AJAX update status

2015-01-20 11:52:55 -08:00

groups

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

help

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

2015-01-21 17:05:31 -08:00

kaminari/gitlab

Migrate forms and inputs pt1

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

layouts

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08: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

2015-01-21 17:05:31 -08:00

profiles

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

2015-01-21 17:05:31 -08:00

projects

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

search

Replace highlight.js with rouge-fork rugments

2015-01-15 13:41:11 +01:00

shared

Fixes the sort dropdown goind outside of the screen

2015-01-17 16:39:29 +01:00

snippets

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

unsubscribes

Use base 64 encoding for email params.

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

users

Cleanup and make contribution calendar faster

2015-01-29 00:53:43 -08:00

votes

Fix votes block. twbs3 progress bars

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