Big bunch o' patches... #137
Open
Conversation
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
…roxy field for parameters
Merge branch 'master' of git://github.com/fdietz/team_dashboard Conflicts: Gemfile.lock app/assets/javascripts/views/widget_editors/boolean.js app/assets/javascripts/views/widget_editors/counter.js app/assets/javascripts/views/widget_editors/graph.js app/assets/javascripts/views/widget_editors/number.js
Conflicts: .gitignore .rvmrc Gemfile Gemfile.lock app/assets/javascripts/views/widget_editors/boolean.js app/assets/javascripts/views/widget_editors/number.js
Conflicts: .rvmrc Gemfile Gemfile.lock app/assets/javascripts/helpers.js app/models/sources/boolean/pingdom.rb app/models/sources/number/new_relic.rb
…ingdom plugin to use the same connection class. Both are configurable through the interface now.
Conflicts: app/models/sources/number/jenkins_game.rb
Conflicts: app/models/sources/boolean/pingdom.rb app/models/sources/number/pingdom_response.rb
Conflicts: app/models/simple_pingdom_interface.rb
Conflicts: app/assets/javascripts/directives/gridster.js app/models/sources/boolean/pingdom.rb
Conflicts: app/models/simple_pingdom_interface.rb config/application.rb config/environments/production.rb
This makes the simple pingdom interface a bit nicer, fixes the specs and adapts my changes to the secrets.yml branch.
* byebug instead of debugger * Lock ruby race to version that works w/ yosemite * Don't force ruby version in the gemfile
It is now possible to specify the New Relic application name in case you have multiple applications deployed with new relic. This commit also removes the "internal" connection class that remained in the code for some reason.
Conflicts: Gemfile
I added our complex_config gem to remove all the custom code for the backend settings. This would also allow to spread out configuration over multiple files, it gives a clean mechanism to access the configuration (with urls already parsed) and it is possible to use ERB interpolations (e.g. for grabbing config from environment variables). Also, the settings were removed from secrets.yml again. Reasoning behind this: * secrets.yml is thought for secrets not general config * It makes sense for normal config settings and api keys to live together * For this app, it makes sense to have a mechanism explicitly for configuring plugins * With complex_config, there is no real advantage of using the secrets.yml file in the first place * specs mocks changed to rspec, to enable new syntax * Documentation updated * BackendSettings removed * complex_config added * plugins.yml (example file) added * secrets example removed Conflicts: .gitignore Gemfile Gemfile.lock app/models/simple_pingdom_interface.rb app/models/sources/number/google_page_speed_score.rb app/models/sources/status_table/pingdom.rb config/initializers/backend_settings.rb spec/models/simple_pingdom_interface_spec.rb
This reverts commit 60654e9.
* Automatically crate plugins.yml during test runs * Fix rspec 2 deprecations
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Big dump to re-synchronize with averell23 version.
Since we made a number of modifications, I don't see any way to break this down into neat little pull requests, at least not within my available time.
Changelog includes:
It would be great if you could review and merge this, so that we can continue to work on the same code base.