diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-12 18:26:01 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-12 18:27:59 +0300 |
| commit | bbd1be002b15ad50b559c217c4e2f9d50a79ef20 (patch) | |
| tree | 781f7cebf2f7aaa25568f5c0d60f0eebfe1f38d1 /app/models | |
| parent | 1028e05378f1fd25b49d95f36cf577a2b819844d (diff) | |
| download | gitlab-ce-bbd1be002b15ad50b559c217c4e2f9d50a79ef20.tar.gz | |
Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-key
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/namespace.rb | 4 | ||||
| -rw-r--r-- | app/models/route.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index cf82b56cc7a..a7ede5e3b9e 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -224,10 +224,6 @@ class Namespace < ActiveRecord::Base parent.present? end - def parent_full_path - full_path.split('/')[0...-1].join('/') - end - private def repository_storage_paths diff --git a/app/models/route.rb b/app/models/route.rb index 12a7fa3d01b..be77b8b51a5 100644 --- a/app/models/route.rb +++ b/app/models/route.rb @@ -35,7 +35,7 @@ class Route < ActiveRecord::Base old_path = route.path # Callbacks must be run manually - route.update_columns(attributes) + route.update_columns(attributes.merge(updated_at: Time.now)) # We are not calling route.delete_conflicting_redirects here, in hopes # of avoiding deadlocks. The parent (self, in this method) already |
