Join GitHub today
GitHub is home to over 31 million developers working together to host and review code, manage projects, and build software together.Sign up
update origin from upstream #1
gigorok merged 558 commits into gigorok:master from activeadmin:master
Mar 2, 2019
added some commits
Nov 26, 2018
Simplify change log entries
The simpler style is also valid "Github Flavored Markdown" and it's simpler.
Add missing characters to implicit link regexp
"]" and ":" are not allowed either inside implicit link definitions.
Remove TODO note
It's not fixed even after that PR was released, and I'm not really sure how we can avoid the current hack.
Improve changelog specs
Using the Kramdown parser warnings includes warnings when implicit links have no definition, and it prints a better error, actually. Also, it probably warns about other stuff that can be interesting to know (and fix).
Replace some instances of `File.dirname(__FILE__)`
Using `__dir__` here is not fully equivalent since `__dir__` also resolves symlinks, but I think resolving symlinks is the best behavior.
Fix coverage merging
Otherwise RSpec parallel spec and Cucumber parallel scenarios get the same command name, so they can overwrite each other.
added some commits
Jan 17, 2019
Remove now uneeded workarounds (activeadmin#5663)
This environment variable has been removed from the official docker images, so overriding it is no longer needed.
Undeprecate external asset registration (activeadmin#5662)
We might reevaluate this in the future, but for now I'm reverting while we figure out good enough alternatives so we can unblock releasing other improvements.
Merge pull request activeadmin#5670 from activeadmin/fix-dependency-d…
…etection fix dependency detection
Merge pull request activeadmin#5671 from activeadmin/rubocop/spaces_a…
…nd_braces Rubocop consistency updates
Using valid CSS for no-gradient mixin (activeadmin#5672)
Changing CSS rule as per @javierjulio suggestion
Update documentation index page to use actions instead of default_act…
…ions in snippet (activeadmin#5676)
Fix rubygems install
Docker image runs as circleci user, which does not have priviledges to write to rubygems folders.
Fix chandler reference by using a tag (activeadmin#5677)
* Fix chandler reference again * Point to a tag instead
Replace cancan with cancancan (activeadmin#5682)
cancan project is deprecated and not updated since some years. Switch to `cancancan` (maintained version) to avoid confusion.
Keep reference only to CanCanCan (activeadmin#5684)
The old CanCan is not maintained since many years. Keep a reference only to the actively maintained version, in order to avoid confusion amongst new users.
Clarify that the command is not needed in the general case
Running `bin/rake local server` should automatically create a fresh new test application and migrate the db.
Update capybara gem version (activeadmin#5698)
Capybara `3.14` contain numerous bug fixes and new features https://github.com/teamcapybara/capybara/blob/master/History.md#version-314
Merge pull request activeadmin#5697 from activeadmin/fix_db_tasks_on_…
…dev_app Fix db tasks on dev app
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.