diff --git a/Gemfile b/Gemfile index 8423b6e..864ac29 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,6 @@ group :development, :test do gem 'webmock', :require => false unless ENV["CI"] gem 'ruby-debug', :platform => :mri_18 - gem (RUBY_VERSION >= "1.9.2" ? 'ruby-debug19' : 'debugger'), :platform => :mri_19 end # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update" end diff --git a/Gemfile.lock b/Gemfile.lock index 36ea4ab..ad8cc27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,6 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.8) - archive-tar-minitar (0.5.2) arel (3.0.2) bcrypt-ruby (3.0.1) bson (1.3.1) @@ -108,8 +107,6 @@ GEM activesupport (>= 3.0.0) linecache (0.46) rbx-require-relative (> 0.0.4) - linecache19 (0.5.13) - ruby_core_source (>= 0.1.4) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -217,18 +214,8 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) - ruby-debug-base19 (0.11.25) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby_core_source (>= 0.1.4) - ruby-debug19 (0.11.6) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby-debug-base19 (>= 0.11.19) ruby-fogbugz (0.1.1) crack - ruby_core_source (0.1.5) - archive-tar-minitar (>= 0.5.2) rubyzip (0.9.8) selenium-webdriver (2.21.2) childprocess (>= 0.2.5) @@ -308,7 +295,6 @@ DEPENDENCIES rspec (~> 2.6) rspec-rails (~> 2.6) ruby-debug - ruby-debug19 ruby-fogbugz therubyracer thin diff --git a/app/helpers/apps_helper.rb b/app/helpers/apps_helper.rb index c9ed6d2..4120ba9 100644 --- a/app/helpers/apps_helper.rb +++ b/app/helpers/apps_helper.rb @@ -16,6 +16,11 @@ module AppsHelper @any_github_repos end + def any_notification_services? + detect_any_apps_with_attributes unless @any_notification_services + @any_notification_services + end + def any_issue_trackers? detect_any_apps_with_attributes unless @any_issue_trackers @any_issue_trackers @@ -29,11 +34,12 @@ module AppsHelper private def detect_any_apps_with_attributes - @any_github_repos = @any_issue_trackers = @any_deploys = false + @any_github_repos = @any_issue_trackers = @any_deploys = @any_notification_services = false @apps.each do |app| @any_github_repos ||= app.github_repo? @any_issue_trackers ||= app.issue_tracker_configured? @any_deploys ||= !!app.last_deploy_at + @any_notification_services ||= app.notification_service_configured? end end end diff --git a/app/views/apps/index.html.haml b/app/views/apps/index.html.haml index fb7ab76..498a2c6 100644 --- a/app/views/apps/index.html.haml +++ b/app/views/apps/index.html.haml @@ -8,6 +8,8 @@ %th Name - if any_github_repos? %th GitHub Repo + - if any_notification_services? + %th Notification Service - if any_issue_trackers? %th Tracker - if any_deploys? @@ -21,6 +23,10 @@ %td.github_repo - if app.github_repo? = link_to(app.github_repo, app.github_url, :target => '_blank') + - if any_notification_services? + %td.notification_service + - if app.notification_service_configured? + = image_tag("#{app.notification_service.label}_goto.png") - if any_issue_trackers? %td.issue_tracker - if app.issue_tracker_configured? -- libgit2 0.21.2