Rémy Coutable 2c3f3cb392 Merge branch 'fix/attr-encrypted-issue' into 'master' ... Fix encrypted data backwards compatibility after upgrading attr_encrypted gem Adds missing attribute to attr_encrypted so it is fully backwards-compatible. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073 See merge request !4963		2016-06-28 08:48:06 +00:00
..
assets	Merge branch 'emoji-menu-stick-search' into 'master'	2016-06-27 18:03:08 +00:00
controllers	Merge remote-tracking branch 'dev/master'	2016-06-27 18:39:42 -04:00
finders	Ensure Todos counters doesn't count Todos for projects pending delete	2016-06-17 16:17:43 -03:00
helpers	add custom highlighting via .gitattributes	2016-06-27 14:17:49 -07:00
mailers	Fallback to group's owners/masters when a project has none	2016-06-20 12:10:37 +02:00
models	Merge branch 'fix/attr-encrypted-issue' into 'master'	2016-06-28 08:48:06 +00:00
services	Correctly returns todo ID after creating todo	2016-06-27 17:00:27 +01:00
uploaders	…
validators	…
views	Merge branch 'feature/custom-highlighting' into 'master'	2016-06-28 08:42:42 +00:00
workers	Merge branch 'repo-check-require-push-events' into 'master'	2016-06-17 19:14:43 +00:00