-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
HELIO-4295 update resque, resque-web, resque-pool #3301
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| /* removed sometime after font-awesome v5, needed by resque-web v0.0.12 */ | ||
| @function fa-font-path($path) { | ||
| @return font-path($path); | ||
| } | ||
|
|
||
| $fa-sass-asset-helper: true; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,3 +20,4 @@ | |
| * require_tree . | ||
| * require_self | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| <%# copied over from the resque_web gem due to https://github.com/resque/resque-web/issues/156 %> | ||
| <%# It's just "Resque::VERSION" instead of Resque::Version at the bottom of this file %> | ||
|
|
||
|
|
||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||
| <meta name="description" content=""> | ||
| <meta name="viewport" content="width=device-width"> | ||
| <title>Resque.</title> | ||
| <%= stylesheet_link_tag "resque_web/application", :media => "all" %> | ||
| <%= | ||
| ResqueWeb::Plugins.plugins.collect do |p| | ||
| file_path = "#{p.name.underscore.downcase}/application.css" | ||
| if (Rails.application.assets && Rails.application.assets.find_asset(file_path)) || | ||
| (Rails.application.assets_manifest && Rails.application.assets_manifest.assets[file_path]) | ||
| stylesheet_link_tag "#{p.name.underscore.downcase}/application" | ||
| end | ||
| end.join("\n").html_safe | ||
| %> | ||
| <%= javascript_include_tag "resque_web/application" %> | ||
| <%= | ||
| ResqueWeb::Plugins.plugins.collect do |p| | ||
| file_path = "#{p.name.underscore.downcase}/application.js" | ||
| if (Rails.application.assets && Rails.application.assets.find_asset(file_path)) || | ||
| (Rails.application.assets_manifest && Rails.application.assets_manifest.assets[file_path]) | ||
| javascript_include_tag "#{p.name.underscore.downcase}/application" | ||
| end | ||
| end.join("\n").html_safe | ||
| %> | ||
| <%= csrf_meta_tags %> | ||
| </head> | ||
| <body> | ||
|
|
||
| <div class="navbar navbar-inverse navbar-fixed-top"> | ||
| <div class="navbar-inner"> | ||
| <div class="container"> | ||
| <a class="btn btn-navbar navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </a> | ||
| <%= image_tag "resque_web/lifebuoy.png", class: 'logo' %> | ||
| <%= link_to "Resque", ResqueWeb::Engine.app.url_helpers.root_path, :class => "brand navbar-brand" %> | ||
| <div class="nav-collapse navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <% tabs.each do |tab_name,path| %> | ||
| <%= tab tab_name,path %> | ||
| <% end %> | ||
| <% if respond_to?(:main_app) %> | ||
| <li><%= link_to "Return to Application", main_app.root_path, :class => "nav navbar-nav" %></li> | ||
| <% end %> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <% unless subtabs.empty? %> | ||
| <ul class="nav subnav"> | ||
| <div class="container"> | ||
| <% subtabs.each do |tab_name| %> | ||
| <%= subtab tab_name %> | ||
| <% end %> | ||
| </div> | ||
| </ul> | ||
| <% end %> | ||
|
|
||
| <div class="container" id="main"> | ||
| <%= yield %> | ||
| </div> | ||
|
|
||
| <footer id="footer"> | ||
| <div class="container"> | ||
| <p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%=Resque::VERSION%></p> | ||
| <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis_id%></p> | ||
| </div> | ||
| </footer> | ||
|
|
||
| </body> | ||
| </html> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This image is missing a text alternative. This is a problem for people using screen readers.