summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-12-14 15:13:09 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-12-14 15:13:09 +0100
commit4eb3c47d4ec3e6750ae79e14eb008ce92fda96fd (patch)
tree5838898ed9a87c8e1e81321ed2cc89fbfe900ecd
parent2497273030e80bd7e4f891c7500901c0a38abea1 (diff)
downloadgitlab-ce-4eb3c47d4ec3e6750ae79e14eb008ce92fda96fd.tar.gz
Fixed a lot of already defined notices
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-rw-r--r--app/models/commit.rb8
-rw-r--r--app/models/project_wiki.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 212229649fc..37dd371ec00 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -10,12 +10,12 @@ class Commit
# Used to prevent 500 error on huge commits by suppressing diff
#
# User can force display of diff above this size
- DIFF_SAFE_FILES = 100
- DIFF_SAFE_LINES = 5000
+ DIFF_SAFE_FILES = 100 unless defined?(DIFF_SAFE_FILES)
+ DIFF_SAFE_LINES = 5000 unless defined?(DIFF_SAFE_LINES)
# Commits above this size will not be rendered in HTML
- DIFF_HARD_LIMIT_FILES = 1000
- DIFF_HARD_LIMIT_LINES = 50000
+ DIFF_HARD_LIMIT_FILES = 1000 unless defined?(DIFF_HARD_LIMIT_FILES)
+ DIFF_HARD_LIMIT_LINES = 50000 unless defined?(DIFF_HARD_LIMIT_LINES)
class << self
def decorate(commits)
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 770a26ed894..f8a28ca9866 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -5,7 +5,7 @@ class ProjectWiki
'Markdown' => :markdown,
'RDoc' => :rdoc,
'AsciiDoc' => :asciidoc
- }
+ } unless defined?(MARKUPS)
class CouldNotCreateWikiError < StandardError; end