Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Podding/Podding
base: 2d3bec936d
...
head fork: Podding/Podding
compare: 496f256393
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Aug 07, 2013
@pfleidi pfleidi Some more cleanups a90b963
Commits on Nov 28, 2013
@pfleidi pfleidi Merge remote-tracking branch 'origin/master'
Conflicts:
	models/audioformat.rb
	models/show.rb
496f256
Showing with 3 additions and 5 deletions.
  1. +3 −5 models/audioformat.rb
View
8 models/audioformat.rb
@@ -6,16 +6,14 @@ class Audioformat < Mlk::Model
attribute :mime_type
def extension
- return data["extension"] if data["extension"]
- ".#{ self.name }"
+ data["extension"] || ".#{ self.name }"
end
def suffix
- return data["suffix"] if data["suffix"]
- ""
+ data["suffix"] || ""
end
- def file_extension # this is what is used to build an audio file url
+ def file_extension
self.suffix + self.extension
end

No commit comments for this range

Something went wrong with that request. Please try again.