Skip to content
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

update origin from upstream #1

Merged
merged 558 commits into from Mar 2, 2019

Conversation

Projects
None yet
@gigorok
Copy link
Owner

gigorok commented Mar 2, 2019

No description provided.

deivid-rodriguez 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).
Add back .ruby-version to gitignore
In the "Project (general)" section.
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.
Remove unnecessary conditional
Since we only test against latest devise.

deivid-rodriguez and others 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.
Fix broken chandler reference (activeadmin#5666)
Due to force-push to the pending PR.
Merge pull request activeadmin#5671 from activeadmin/rubocop/spaces_a…
…nd_braces

Rubocop consistency updates
Fix rubygems install
Docker image runs as circleci user, which does not have priviledges to
write to rubygems folders.
Install chromedriver to an existing folder
And overwrite the existing version.
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.
Fix db tasks on development application
`db` is a whole namespace, not a specific task.
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.

@gigorok gigorok marked this pull request as ready for review Mar 2, 2019

@gigorok gigorok merged commit b54dbd0 into gigorok:master Mar 2, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.