Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02:00

..

admin

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

dashboard

Link to trending public projects so more relevant projects are shown to new users.

2014-10-17 16:27:44 +02:00

devise

Merge branch 'feature_password_strength_indicator' into 'master'

2014-10-30 11:32:11 +00:00

errors

Improve error page layout

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

events

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

explore

Merge pull request #7866 from cirosantilli/input-button-to-tag

2014-10-28 12:11:15 +02:00

groups

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

help

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

kaminari/gitlab

Migrate forms and inputs pt1

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

layouts

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

ldap_group_links

Adapt frontend to LdapGroupLink with provider

2014-10-10 21:50:54 +02:00

notify

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

profiles

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

projects

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

search

Merge pull request #7866 from cirosantilli/input-button-to-tag

2014-10-28 12:11:15 +02:00

shared

Merge pull request #8113 from cirosantilli/factor-group-forms

2014-10-21 11:39:41 +03: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

Remove whitespace link between user group avatars

2014-10-21 20:19:07 +02:00

votes

Fix votes block. twbs3 progress bars

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