diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-10 13:53:47 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-10 13:53:47 +0000 |
| commit | d01e5a04ccee4659fdab8f381a12201daa1c8cb5 (patch) | |
| tree | 24c051930b7b8341fc174426fb89fb012bd98e1b /app/models/notification_setting.rb | |
| parent | 7358211ece27ccc9b6653b73efd9cada8bbb254a (diff) | |
| parent | 191d8ecff6ece1a7f57b5d033cbe7405e4e06933 (diff) | |
| download | gitlab-ce-d01e5a04ccee4659fdab8f381a12201daa1c8cb5.tar.gz | |
Merge branch 'revert-3755d828' into 'master'
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
See merge request gitlab-org/gitlab-ce!20525
Diffstat (limited to 'app/models/notification_setting.rb')
0 files changed, 0 insertions, 0 deletions