Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master' ...

CE changes from upstream

See merge request !266

2014-12-12 12:25:36 +00:00

..

admin

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

audit_events

UI fixes for events table

2014-12-01 16:47:36 +01:00

dashboard

DRY and refactor atom code

2014-12-04 22:14:20 +02:00

devise

added helper

2014-12-04 13:03:55 +02: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

Create helper for sort drowdown option names

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

groups

Hide ldap group links if ldap is not enabled

2014-12-08 15:45:55 +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 branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

ldap_group_links

Prevent 500 error on ldap group links page

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

notify

Merge CE master into EE master

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

profiles

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

projects

Merge branch 'ce-changes' into 'master'

2014-12-12 12:25:36 +00:00

search

Respect current controller scope when using search from project area

2014-12-02 22:38:45 +02:00

shared

Create helper for sort drowdown option names

2014-12-04 12:10:38 +02: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

DRY and refactor atom code

2014-12-04 22:14:20 +02:00

votes

Fix votes block. twbs3 progress bars

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