Rémy CoutableandRobert Speicher 106f7f308c 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
(cherry picked from commit 2c3f3cb392)

2016-06-28 16:52:55 -04:00

..

build.rb

Merge branch 'feature/runner-lock-on-project' into 'master'

2016-06-21 12:17:20 -04:00

pipeline.rb

Merge branch 'fix/import-export-gitlab-errors' into 'master'

2016-06-23 14:36:40 -04:00

runner_project.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

runner.rb

Merge branch 'feature/runner-lock-on-project' into 'master'

2016-06-21 12:17:20 -04:00

trigger_request.rb

Rename commit to pipeline in TriggerRequest

2016-06-09 17:57:07 +02:00

trigger.rb

Remove the annotate gem and delete old annotations

2016-05-09 18:00:28 +02:00

variable.rb

Merge branch 'fix/attr-encrypted-issue' into 'master'

2016-06-28 16:52:55 -04:00