diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 12:33:55 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 12:33:55 +0300 |
| commit | 00053c805c9c83baca25b83919f89b024c51d7c8 (patch) | |
| tree | 4afb25c2ae87c81cbe76ca9797c6d3e65a43e3df /app/models | |
| parent | 98291295a782b5fdf74e0b4742a35857054facbb (diff) | |
| parent | 562d78a65a5d6d9ebd593b0fe20d1cbc187bc570 (diff) | |
Merge branch 'ssh-key-linebreaks' into 'master'
Add error message for SSH key linebreaks
Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key).
See merge request !672
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/key.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index bbc28678177..2dcae059c0e 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -24,6 +24,7 @@ class Key < ActiveRecord::Base validates :title, presence: true, length: { within: 0..255 } validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\A(ssh|ecdsa)-.*\Z/ }, uniqueness: true + validates :key, format: { without: /\n|\r/, message: 'should be a single line' } validates :fingerprint, uniqueness: true, presence: { message: 'cannot be generated' } delegate :name, :email, to: :user, prefix: true |