| Age | Commit message (Collapse) | Author |
|---|
|
specify which gems for which environments.
Here, we have the billing gem included for the development and test environments only, hardcoded in the Gemfile.
Then we show the links to billing based on a config file setting. The setting itself could be used to specify different types of billing, but isn't yet.
|
|
|
|
disable, must remove billing engine from Gemfile (and re-bundle)
|
|
Feature/identity rewrite
|
|
|
|
Conflicts:
app/views/home/index.html.haml
|
|
|
|
customer.
|
|
PGP setting has been moved into account settings. It's using the API now issueing an Ajax request without any visual feedback.
This obviously is not what we want but it hopefully suffices for uploading gpg keys for testing purposes before the Identity UI is in place.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/views/layouts/_messages.html.haml
app/views/layouts/application.html.haml
users/app/assets/javascripts/users.js.coffee
|
|
installations, so leap's icons moved to /leap-img/
|
|
|
|
recipes.
|
|
|
|
|
|
|
|
admins) or stay as a nested resource for a particular user (for normal users and when you visit the tickets list of a particular user).
|
|
|
|
validation.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This was breaking inclusion of other js.
|
|
|
|
|
|
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
|
|
|
|
|
