activeadmin_addons 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 531c67c68a5765e46886b34a7464c8716c627d365973cc4a12f6ae6cd0602cd8
-  data.tar.gz: cb1fe943a90453b765713b7106dd611cf4f8a4e512f37fba3a1eb83fc7a24e7e
+  metadata.gz: 4b9dda1dd638a9f6dd2f34a4c17d833380ebd064266d11c8a661b61d64d23aa5
+  data.tar.gz: 883385a84d420dbb7e6471a5067caa061acd2716f3a6a13dd2377173175b9afc
 SHA512:
-  metadata.gz: df0a5e6678526e189ae2f7e05bbfec2c6a6ae4bd7d80395ee3af2d9552aad1f2e4f67200b2b5ccad3299624471713b975ad2022cc243329f360c3222ee920b82
-  data.tar.gz: 712e3c2a0ce9cc1643b78dede3befe4956faf6e5027771fa16720c9c935a5f6ff16457e5b54a7bdeb672689d03ea754f4c73c50110a1068c56dd0f2450472ce0
+  metadata.gz: c4b0d647cbffe448db606b4730c6536b2e57f092330feeec9261d356e1d20450777176dd257ca438d258c0bd57bee86dc98491d0b4e0fc39456f1dd09f51444e
+  data.tar.gz: e6f45b0a582052bcbb8fb126dace1455b6e3d576972303a654944bea57706cd36b94162bcc2820859b15571cc5066474945e517981f642a10cae7eea86d5d8ff

data/lib/activeadmin_addons/addons/tag_builder.rb

@@ -8,7 +8,7 @@ module ActiveAdminAddons
                    end
 
       raise "you need to pass an enumerize or enum attribute" unless @enum_attr
-      context.status_tag(display_data, data)
+      context.status_tag(display_data, class: data)
     end
 
     def display_data

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/vendor/bundle/ruby/2.3.0/bundler/gems/activeadmin-f71b375325eb/CHANGELOG.md

@@ -0,0 +1,298 @@
+# Changelog
+
+### Bug fixes
+
+## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0...v1.2.1)
+
+### Bug Fixes
+
+* Resolve issue with [#5275][] preventing XSS in filters sidebar. [#5299][] by [@faucct][]
+
+## 1.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.1.0...v1.2.0)
+
+### Enhancements
+
+#### Minor
+
+* Do not display pagination info when there are no comments [#5119][] by [@alex-bogomolov][]
+* Revert generated config files to pluralized [#5120][] by [@varyonic][], [#5137][] by [@deivid-rodriguez][]
+* Warn when action definition overwrites controller method [#5167][] by [@aarek][]
+* Better performance of comments show view [#5208][] by [@dhyegofernando][]
+* Mitigate memory bloat [#4118][] with CSV exports [#5251][] by [@f1sherman][]
+* Fix issue applying custom decorations [#5253][] by [@faucct][]
+* Translations:
+  * Brazilian locale updated [#5125][] by [@renotocn][]
+  * Japanese locale updated [#5143][] by [@5t111111][], [#5157][] by [innparusu95][]
+  * Italian locale updated [#5180][] by [@blocknotes][]
+  * Swedish locale updated [#5187][] by [@jawa][]
+  * Vietnamese locale updated [#5194][] by [@Nguyenanh][]
+  * Esperanto locale added [#5210][] by [@RobinvanderVliet][]
+
+### Bug Fixes
+
+* Fix a couple of issues rendering filter labels [#5223][] by [@wspurgin][]
+* Prevent NameError when filtering on a namespaced association [#5240][] by [@DanielHeath][]
+* Fix undefined method error in Ransack when building filters [#5238][] by [@wspurgin][]
+* Fixed [#5198][] Prevent XSS on sidebar's current filter rendering [#5275][] by [@deivid-rodriguez][]
+* Sanitize display_name [#5284][] by [@markstory][].
+
+## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
+
+### Bug Fixes
+
+* Fixed [#5093][] Handle table prefix & table suffix for `ActiveAdminComment` model
+* Fixed [#4173][] by including the default Kaminari templates. [#5069][] by [@javierjulio][]
+* Fixed [#5043][]. Do not crash in sidebar rendering when a default scope is not
+  specified. [#5044][] by [@Fivell][]
+* Fixed [#3894][]. Make tab's component work with non-ascii titles. [#5046] by
+  [@Fivell][]
+
+### Removals
+
+* Ruby 2.1 support has been dropped. [#5003][] by [@deivid-rodriguez][]
+* Replaced `sass-rails` with `sass` dependency. [#5037][] by [@javierjulio][]
+* Removed `jquery-ui-rails` as a dependency. The specific jQuery UI assets used
+  are now within the vendor directory. This will be replaced by alternatives and
+  dropped entirely in a major release. Please remove any direct inclusions
+  of `//= require jquery-ui`. [#5052][] by [@javierjulio][]
+* AA won't work properly with jQuery 1 & 2. Use jQuery 3 instead (`#= require jquery3`
+ in `active_admin.js.coffee`)
+
+### Deprecations
+
+* Deprecated `config.register_stylesheet` and `config.register_javascript`. Import
+  your CSS and JS files in `active_admin.scss` or `active_admin.js`. [#5060][] by [@javierjulio][]
+* Deprecated `type` param from `status_tag` and related CSS classes [#4989][] by [@javierjulio][]
+  * The method signature has changed from:
+
+    ```ruby
+    status_tag(status, :ok, class: 'completed', label: 'on')
+    ```
+
+    to:
+
+    ```ruby
+    status_tag(status, class: 'completed ok', label: 'on')
+    ```
+
+  * The following CSS classes have been deprecated and will be removed in the future:
+
+    ```css
+    .status_tag {
+      &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
+      &.warn, &.warning, &.orange { background: #e29b20; }
+      &.error, &.errored, &.red { background: #d45f53; }
+    }
+    ```
+
+### Enhancements
+
+#### Minor
+
+* Support proc as an input_html option value when declaring filters. [#5029][] by [@Fivell][]
+* Base localization support, better associations handling for active filters sidebar. [#4951][] by [@Fivell][]
+* Allow AA scopes to return paginated collections. [#4996][] by [@Fivell][]
+* Added `scopes_show_count` configuration to  setup show_count attribute for scopes globally. [#4950][] by [@Fivell][]
+* Allow custom panel title given with `attributes_table`. [#4940][] by [@ajw725][]
+* Allow passing a class to `action_item` block. [#4997][] by [@Fivell][]
+* Add pagination to the comments section. [#5088][] by [@alex-bogomolov][]
+
+## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...master)
+
+### Breaking Changes
+
+* Rename `allow_comments` to `comments` for more consistent naming. [#3695][] by [@pranas][]
+* JavaScript `window.AA` has been removed, use `window.ActiveAdmin`. [#3606][] by [@timoschilling][]
+* `f.form_buffers` has been removed. [#3486][] by [@varyonic][]
+* Iconic has been removed. [#3553][] by [@timoschilling][]
+* `config.show_comments_in_menu` has been removed, see `config.comments_menu`. [#4187][] by [@drn][]
+* Rails 3.2 & Ruby 1.9.3 support has been dropped. [#4848][] by [@deivid-rodriguez][]
+* Ruby 2.0.0 support has been dropped. [#4851][] by [@deivid-rodriguez][]
+* Rails 4.0 & 4.1 support has been dropped. [#4870][] by [@deivid-rodriguez][]
+
+### Enhancements
+
+#### Major
+
+* Migration from Metasearch to Ransack. [#1979][] by [@seanlinsley][]
+* Rails 4 support. [#2326][] by many people :heart:
+* Rails 4.2 support. [#3731][] by [@gonzedge][] and [@timoschilling][]
+* Rails 5 support. [#4254][] by [@seanlinsley][]
+* Rails 5.1 support. [#4882][] by [@varyonic][]
+
+#### Minor
+
+* "Create another" checkbox for the new resource page. [#4477][] by [@bolshakov][]
+* Page supports belongs_to. [#4759][] by [@Fivell][] and [@zorab47][]
+* Support for custom sorting strategies. [#4768][] by [@Fivell][]
+* Stream CSV downloads as they're generated. [#3038][] by [@craigmcnamara][]
+  * Disable streaming in development for easier debugging. [#3535][] by [@seanlinsley][]
+* Improved code reloading. [#3783][] by [@chancancode][]
+* Do not auto link to inaccessible actions. [#3686][] by [@pranas][]
+* Allow to enable comments on per-resource basis. [#3695][] by [@pranas][]
+* Unify DSL for index `actions` and `actions dropdown: true`. [#3463][] by [@timoschilling][]
+* Add DSL method `includes` for `ActiveRecord::Relation#includes`. [#3464][] by [@timoschilling][]
+* BOM (byte order mark) configurable for CSV download. [#3519][] by [@timoschilling][]
+* Column block on table index is now sortable by default. [#3075][] by [@dmitry][]
+* Allow Arbre to be used inside ActiveAdmin forms. [#3486][] by [@varyonic][]
+* Make AA ORM-agnostic. [#2545][] by [@johnnyshields][]
+* Add multi-record support to `attributes_table_for`. [#2544][] by [@zorab47][]
+* Table CSS classes are now prefixed to prevent clashes. [#2532][] by [@TimPetricola][]
+* Allow Inherited Resources shorthand for redirection. [#2001][] by [@seanlinsley][]
+
+```ruby
+    controller do
+      # Redirects to index page instead of rendering updated resource
+      def update
+        update!{ collection_path }
+      end
+    end
+```
+
+* Accept block for download links. [#2040][] by [@potatosalad][]
+
+```ruby
+index download_links: ->{ can?(:view_all_download_links) || [:pdf] }
+```
+
+* Comments menu can be customized via configuration passed to `config.comments_menu`. [#4187][] by [@drn][]
+* Added `config.route_options` to namespace to customize routes. [#4467][] by [@stereoscott[]]
+
+### Security Fixes
+
+* Prevents access to formats that the user not permitted to see. [#4867][] by [@Fivell][] and [@timoschilling][]
+* Prevents potential DOS attack via Ruby symbols. [#1926][] by [@seanlinsley][]
+  * [this isn't an issue for those using Ruby >= 2.2](http://rubykaigi.org/2014/presentation/S-NarihiroNakamura)
+
+### Bug Fixes
+
+* Fixes filters for `has_many :through` relationships. [#2541][] by [@shekibobo][]
+* "New" action item now only shows up on the index page. bf659bc by [@seanlinsley][]
+* Fixes comment creation bug with aliased resources. 9a082486 by [@seanlinsley][]
+* Fixes the deletion of `:if` and `:unless` from filters. [#2523][] by [@PChambino][]
+
+### Deprecations
+
+* `ActiveAdmin::Event` (`ActiveAdmin::EventDispatcher`). [#3435][] by [@timoschilling][]
+  `ActiveAdmin::Event` will be removed in a future version, ActiveAdmin switched
+  to use `ActiveSupport::Notifications`
+  NOTE: The blog parameters has changed:
+
+```ruby
+ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent do |event, *args|
+  # some code
+end
+
+ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent, "some data"
+```
+
+## Previous Changes
+
+Please check [0-6-stable][] for previous changes.
+
+[0-6-stable]: https://github.com/activeadmin/activeadmin/blob/0-6-stable/CHANGELOG.md
+
+[#1926]: https://github.com/activeadmin/activeadmin/issues/1926
+[#1979]: https://github.com/activeadmin/activeadmin/issues/1979
+[#2001]: https://github.com/activeadmin/activeadmin/issues/2001
+[#2040]: https://github.com/activeadmin/activeadmin/issues/2040
+[#2326]: https://github.com/activeadmin/activeadmin/issues/2326
+[#2523]: https://github.com/activeadmin/activeadmin/issues/2523
+[#2532]: https://github.com/activeadmin/activeadmin/issues/2532
+[#2541]: https://github.com/activeadmin/activeadmin/issues/2541
+[#2544]: https://github.com/activeadmin/activeadmin/issues/2544
+[#2545]: https://github.com/activeadmin/activeadmin/issues/2545
+[#3038]: https://github.com/activeadmin/activeadmin/issues/3038
+[#3075]: https://github.com/activeadmin/activeadmin/issues/3075
+[#3463]: https://github.com/activeadmin/activeadmin/issues/3463
+[#3464]: https://github.com/activeadmin/activeadmin/issues/3464
+[#3486]: https://github.com/activeadmin/activeadmin/issues/3486
+[#3519]: https://github.com/activeadmin/activeadmin/issues/3519
+[#3535]: https://github.com/activeadmin/activeadmin/issues/3535
+[#3553]: https://github.com/activeadmin/activeadmin/issues/3553
+[#3606]: https://github.com/activeadmin/activeadmin/issues/3606
+[#3686]: https://github.com/activeadmin/activeadmin/issues/3686
+[#3695]: https://github.com/activeadmin/activeadmin/issues/3695
+[#3731]: https://github.com/activeadmin/activeadmin/issues/3731
+[#3783]: https://github.com/activeadmin/activeadmin/issues/3783
+[#3894]: https://github.com/activeadmin/activeadmin/issues/3894
+[#4118]: https://github.com/activeadmin/activeadmin/issues/4118
+[#4187]: https://github.com/activeadmin/activeadmin/issues/4187
+[#4173]: https://github.com/activeadmin/activeadmin/issues/4173
+[#4254]: https://github.com/activeadmin/activeadmin/issues/4254
+[#5043]: https://github.com/activeadmin/activeadmin/issues/5043
+[#5198]: https://github.com/activeadmin/activeadmin/issues/5198
+
+[#4477]: https://github.com/activeadmin/activeadmin/pull/4477
+[#4759]: https://github.com/activeadmin/activeadmin/pull/4759
+[#4768]: https://github.com/activeadmin/activeadmin/pull/4768
+[#4848]: https://github.com/activeadmin/activeadmin/pull/4848
+[#4851]: https://github.com/activeadmin/activeadmin/pull/4851
+[#4867]: https://github.com/activeadmin/activeadmin/pull/4867
+[#4870]: https://github.com/activeadmin/activeadmin/pull/4870
+[#4882]: https://github.com/activeadmin/activeadmin/pull/4882
+[#4940]: https://github.com/activeadmin/activeadmin/pull/4940
+[#4950]: https://github.com/activeadmin/activeadmin/pull/4950
+[#4951]: https://github.com/activeadmin/activeadmin/pull/4951
+[#4989]: https://github.com/activeadmin/activeadmin/pull/4989
+[#4996]: https://github.com/activeadmin/activeadmin/pull/4996
+[#4997]: https://github.com/activeadmin/activeadmin/pull/4997
+[#5029]: https://github.com/activeadmin/activeadmin/pull/5029
+[#5003]: https://github.com/activeadmin/activeadmin/pull/5003
+[#5037]: https://github.com/activeadmin/activeadmin/pull/5037
+[#5044]: https://github.com/activeadmin/activeadmin/pull/5044
+[#5046]: https://github.com/activeadmin/activeadmin/pull/5046
+[#5052]: https://github.com/activeadmin/activeadmin/pull/5052
+[#5060]: https://github.com/activeadmin/activeadmin/pull/5060
+[#5069]: https://github.com/activeadmin/activeadmin/pull/5069
+[#5088]: https://github.com/activeadmin/activeadmin/pull/5088
+[#5093]: https://github.com/activeadmin/activeadmin/pull/5093
+[#5119]: https://github.com/activeadmin/activeadmin/pull/5119
+[#5120]: https://github.com/activeadmin/activeadmin/pull/5120
+[#5125]: https://github.com/activeadmin/activeadmin/pull/5125
+[#5137]: https://github.com/activeadmin/activeadmin/pull/5137
+[#5143]: https://github.com/activeadmin/activeadmin/pull/5143
+[#5167]: https://github.com/activeadmin/activeadmin/pull/5167
+[#5180]: https://github.com/activeadmin/activeadmin/pull/5180
+[#5187]: https://github.com/activeadmin/activeadmin/pull/5187
+[#5194]: https://github.com/activeadmin/activeadmin/pull/5194
+[#5208]: https://github.com/activeadmin/activeadmin/pull/5208
+[#5210]: https://github.com/activeadmin/activeadmin/pull/5210
+[#5251]: https://github.com/activeadmin/activeadmin/pull/5251
+[#5253]: https://github.com/activeadmin/activeadmin/pull/5253
+[#5272]: https://github.com/activeadmin/activeadmin/pull/5272
+[#5284]: https://github.com/activeadmin/activeadmin/pull/5284
+
+[@5t111111]: https://github.com/5t111111
+[@aarek]: https://github.com/aarek
+[@ajw725]: https://github.com/ajw725
+[@alex-bogomolov]: https://github.com/alex-bogomolov
+[@bolshakov]: https://github.com/bolshakov
+[@blocknotes]: https://github.com/blocknotes
+[@chancancode]: https://github.com/chancancode
+[@craigmcnamara]: https://github.com/craigmcnamara
+[@deivid-rodriguez]: https://github.com/deivid-rodriguez
+[@dhyegofernando]: https://github.com/dhyegofernando
+[@dmitry]: https://github.com/dmitry
+[@drn]: https://github.com/drn
+[@f1sherman]: https://github.com/f1sherman
+[@faucct]: https://github.com/faucct
+[@Fivell]: https://github.com/Fivell
+[@gonzedge]: https://github.com/gonzedge
+[@innparusu95]: https://github.com/innparusu95
+[@javierjulio]: https://github.com/javierjulio
+[@jawa]: https://github.com/jawa
+[@johnnyshields]: https://github.com/johnnyshields
+[@markstory]: https://github.com/markstory
+[@Nguyenanh]: https://github.com/Nguyenanh
+[@PChambino]: https://github.com/PChambino
+[@potatosalad]: https://github.com/potatosalad
+[@pranas]: https://github.com/pranas
+[@renotocn]: https://github.com/renotocn
+[@RobinvanderVliet]: https://github.com/RobinvanderVliet
+[@seanlinsley]: https://github.com/seanlinsley
+[@shekibobo]: https://github.com/shekibobo
+[@timoschilling]: https://github.com/timoschilling
+[@TimPetricola]: https://github.com/TimPetricola
+[@varyonic]: https://github.com/varyonic
+[@zorab47]: https://github.com/zorab47

data/vendor/bundle/ruby/2.3.0/bundler/gems/activeadmin-f71b375325eb/CODE_OF_CONDUCT.md

@@ -0,0 +1,40 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct. By adopting this Code of Conduct, project
+maintainers commit themselves to fairly and consistently applying these
+principles to every aspect of managing this project. Project maintainers who do
+not follow or enforce the Code of Conduct may be permanently removed from the
+project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting one or more of the project
+maintainers.
+
+This Code of Conduct is adapted from the [Contributor
+Covenant](http://contributor-covenant.org), version 1.2.0, available at
+[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

data/vendor/bundle/ruby/2.3.0/bundler/gems/activeadmin-f71b375325eb/CONTRIBUTING.md

@@ -0,0 +1,203 @@
+## Contributing
+
+First off, thank you for considering contributing to Active Admin. It's people
+like you that make Active Admin such a great tool.
+
+### 1. Where do I go from here?
+
+If you've noticed a bug or have a question that doesn't belong on the
+[mailing list][] or [Stack Overflow][], [search the issue tracker][] to see if
+someone else in the community has already created a ticket. If not, go ahead and
+[make one][new issue]!
+
+### 2. Fork & create a branch
+
+If this is something you think you can fix, then [fork Active Admin][] and
+create a branch with a descriptive name.
+
+A good branch name would be (where issue #325 is the ticket you're working on):
+
+```sh
+git checkout -b 325-add-japanese-translations
+```
+
+### 3. Get the test suite running
+
+Make sure you're using a recent ruby and have the `bundler` gem installed, at
+least version `1.14.3`.
+
+Select the Gemfile for your preferred Rails version, preferably the latest:
+
+```sh
+export BUNDLE_GEMFILE=gemfiles/rails_51.gemfile
+```
+
+Now install the development dependencies:
+
+```sh
+bundle install
+```
+
+Now you should be able to run the entire suite using:
+
+```sh
+bundle exec rake
+```
+
+The test run will generate a sample Rails application in `spec/rails` to run the
+tests against.
+
+If your tests are passing locally but they're failing on Travis, reset your test
+environment:
+
+```sh
+rm -rf spec/rails && bundle update
+```
+
+### 4. Did you find a bug?
+
+* **Ensure the bug was not already reported** by [searching all issues][].
+
+* If you're unable to find an open issue addressing the problem,
+  [open a new one][new issue]. Be sure to include a **title and clear
+  description**, as much relevant information as possible, and a **code sample**
+  or an **executable test case** demonstrating the expected behavior that is not
+  occurring.
+
+* If possible, use the relevant bug report templates to create the issue.
+  Simply copy the content of the appropriate template into a .rb file, make the
+  necessary changes to demonstrate the issue, and **paste the content into the
+  issue description**:
+  * [**ActiveAdmin** master issues][master template]
+
+### 5. Implement your fix or feature
+
+At this point, you're ready to make your changes! Feel free to ask for help;
+everyone is a beginner at first :smile_cat:
+
+### 6. View your changes in a Rails application
+
+Active Admin is meant to be used by humans, not cucumbers. So make sure to take
+a look at your changes in a browser.
+
+To boot up a test Rails app:
+
+```sh
+bundle exec rake local server
+```
+
+This will automatically create a Rails app if none already exists, and store it
+in the `.test-rails-apps` folder.
+
+You should now be able to open <http://localhost:3000/admin> in your browser.
+You can log in using:
+
+*User*: admin@example.com
+*Password*: password
+
+If you need to perform any other commands on the test application, just pass
+them to the `local` rake task. For example, to boot the rails console:
+
+```sh
+bundle exec rake local console
+```
+
+Or to migrate the database:
+
+```sh
+bundle exec rake local db:migrate
+```
+
+### 7. Get the style right
+
+Your patch should follow the same conventions & pass the same code quality
+checks as the rest of the project. [Codeclimate][codeclimate] will give you
+feedback in this regard. You can check & fix codeclimate's feedback by running
+it locally using [Codeclimate's CLI][codeclimate cli], via `codeclimate analyze`.
+
+### 8. Make a Pull Request
+
+At this point, you should switch back to your master branch and make sure it's
+up to date with Active Admin's master branch:
+
+```sh
+git remote add upstream git@github.com:activeadmin/activeadmin.git
+git checkout master
+git pull upstream master
+```
+
+Then update your feature branch from your local copy of master, and push it!
+
+```sh
+git checkout 325-add-japanese-translations
+git rebase master
+git push --set-upstream origin 325-add-japanese-translations
+```
+
+Finally, go to GitHub and [make a Pull Request][] :D
+
+Travis CI will run our test suite against all supported Rails versions. We care
+about quality, so your PR won't be merged until all tests pass. It's unlikely,
+but it's possible that your changes pass tests in one Rails version but fail in
+another. In that case, you'll have to setup your development environment (as
+explained in step 3) to use the problematic Rails version, and investigate
+what's going on!
+
+### 8. Keeping your Pull Request updated
+
+If a maintainer asks you to "rebase" your PR, they're saying that a lot of code
+has changed, and that you need to update your branch so it's easier to merge.
+
+To learn more about rebasing in Git, there are a lot of [good][git rebasing]
+[resources][interactive rebase] but here's the suggested workflow:
+
+```sh
+git checkout 325-add-japanese-translations
+git pull --rebase upstream master
+git push --force-with-lease 325-add-japanese-translations
+```
+
+### 10. Merging a PR (maintainers only)
+
+A PR can only be merged into master by a maintainer if:
+
+* It is passing CI.
+* It has been approved by at least two maintainers. If it was a maintainer who
+  opened the PR, only one extra approval is needed.
+* It has no requested changes.
+* It is up to date with current master.
+
+Any maintainer is allowed to merge a PR if all of these conditions are
+met.
+
+### 11. Shipping a release (maintainers only)
+
+Maintainers need to do the following to push out a release:
+
+* Make sure all pull requests are in and that changelog is current
+* Update `version.rb` file and changelog with new version number
+* Create a stable branch for that release:
+
+  ```sh
+  git checkout master
+  git fetch activeadmin
+  git rebase activeadmin/master
+  # If the release is 2.1.x then this should be: 2-1-stable
+  git checkout -b N-N-stable
+  git push activeadmin N-N-stable:N-N-stable
+  ```
+
+* `bundle exec rake release`
+
+[mailing list]: http://groups.google.com/group/activeadmin
+[Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
+[search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
+[new issue]: https://github.com/activeadmin/activeadmin/issues/new
+[fork Active Admin]: https://help.github.com/articles/fork-a-repo
+[searching all issues]: https://github.com/activeadmin/activeadmin/issues?q=
+[master template]: https://github.com/activeadmin/activeadmin/blob/master/lib/bug_report_templates/active_admin_master.rb
+[codeclimate]: https://codeclimate.com
+[codeclimate cli]: https://github.com/codeclimate/codeclimate
+[make a pull request]: https://help.github.com/articles/creating-a-pull-request
+[git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
+[interactive rebase]: https://help.github.com/articles/interactive-rebase