diff options
author | Marco Wessel <marco@poop.nl> | 2015-01-30 00:16:24 +0100 |
---|---|---|
committer | Marco Wessel <marco@poop.nl> | 2015-01-30 00:16:24 +0100 |
commit | 20e269cb925cfad58cce0b19e17aa15075c4481e (patch) | |
tree | d53e52bcc3881ca25f67b6cdeb473bf3d6290369 /lib/extracts_path.rb | |
parent | 2a4502111e03c233861b545ae3ff3afd95614c4a (diff) | |
parent | 604f39274dc1558f8710019e226b1a364f056d7e (diff) | |
download | gitlab-ce-20e269cb925cfad58cce0b19e17aa15075c4481e.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
Conflicts:
CHANGELOG
db/schema.rb
Diffstat (limited to 'lib/extracts_path.rb')
-rw-r--r-- | lib/extracts_path.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb index e51cb30bdd9..19215cfb7e6 100644 --- a/lib/extracts_path.rb +++ b/lib/extracts_path.rb @@ -1,17 +1,9 @@ # Module providing methods for dealing with separating a tree-ish string and a # file path string when combined in a request parameter module ExtractsPath - extend ActiveSupport::Concern - # Raised when given an invalid file path class InvalidPathError < StandardError; end - included do - if respond_to?(:before_filter) - before_filter :assign_ref_vars - end - end - # Given a string containing both a Git tree-ish, such as a branch or tag, and # a filesystem path joined by forward slashes, attempts to separate the two. # |