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

gigorok merged 558 commits into gigorok:master from activeadmin:master

Mar 2, 2019

Owner

gigorok commented Mar 2, 2019

No description provided.

deivid-rodriguez added some commits Nov 26, 2018


      Add chandler gem to automate github releases

be253b8


      Run chandler right after release

f6811a6


      Use my chandler fork

3b39dba


      Clarify one bullet point in releasing docs

b8272fd


      Add a note about chandler in release docs

ee2de22


      Simplify change log entries

The simpler style is also valid "Github Flavored Markdown" and it's simpler.

44de0a8


      Add missing characters to implicit link regexp

"]" and ":" are not allowed either inside implicit link definitions.

a570768


      Fix user link in change log

6cfd511


      Check issue, PR and user URLs in changelog

343bcaa


      Just pass the block through

3a51895


      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.

7d84524


      Bump mdl to 0.5.0 and fix new offenses

1ec8c5d


      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).

64b3031


      Use kramdown implementation in all platforms

8d6d8f0


      Remove more unnecessary stuff

c460123


      I don't think this makes any difference nowadays

f719f2e


      Simplify gitignore

b5d8435


      Add back .ruby-version to gitignore

In the "Project (general)" section.

b1972b6


      Enable `Style/ExpandPathArguments` cop

edc0921


      Bump rubocop to 0.60.0

46c3d17


      Enable `Style/Dir` cop

e1e485b


      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.

1ed600f


      Replace __FILE__ with __dir__ in other places

eecf56d


      Enable Rails/FilePath cop

2cf4380


      Enforce no empty lines around block bodies

9297bbd


      Enable RSpec/HookArgument cop

7ff4efe


      Cleanup dead code in cucumber scenarios

0ea0fa1


      Fix coverage merging

Otherwise RSpec parallel spec and Cucumber parallel scenarios get the
same command name, so they can overwrite each other.

f749eb4


      Ignore some uncovered code that I want to keep

1bb930a


      Remove unnecessary conditional

Since we only test against latest devise.

e404b78

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.

cdcc57b


      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.

0d8bf1e


      Fix broken chandler reference (activeadmin#5666)

Due to force-push to the pending PR.

1a1f67b


      fix dependency detection

fixes: activeadmin#5209

3cb83ac


      Merge pull request activeadmin#5670 from activeadmin/fix-dependency-d…

…etection

fix dependency detection

3fa45b0


      Enable `Layout/SpaceBeforeBlockBraces` cop


      Enable `Layout/SpaceInsideHashLiteralBraces` cop

ae0295c


      Bump rubocop to 0.63.1

b05c2f3


      Merge pull request activeadmin#5671 from activeadmin/rubocop/spaces_a…

…nd_braces

Rubocop consistency updates

3b4c477


      Enable Style/SpaceInsideBlockBraces cop (activeadmin#5673)

666f148


      Using valid CSS for no-gradient mixin (activeadmin#5672)

Changing CSS rule as per @javierjulio suggestion


      Bump base ruby of utility circleCI jobs to 2.6.1

3f79d3e


      Update documentation index page to use actions instead of default_act…

…ions in snippet (activeadmin#5676)

8534ae2


      Add ruby 2.6 jobs to CircleCI config

4f08d2f


      Fix rubygems install

Docker image runs as circleci user, which does not have priviledges to
write to rubygems folders.

dad43f1


      Install chromedriver to an existing folder

And overwrite the existing version.

97b2303


      Merge pull request activeadmin#5657 from activeadmin/ruby2.6

Test against ruby 2.6

77190da


      Fix chandler reference by using a tag (activeadmin#5677)

* Fix chandler reference again

* Point to a tag instead

977b5aa


      Our chandler changes were finally released 🎉 (activeadmin#5678)

d95a9a8


      Replace cancan with cancancan (activeadmin#5682)

cancan project is deprecated and not updated since some years. Switch to `cancancan` (maintained version) to avoid confusion.

adec4f2


      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.

49a7507


      Switch from cancan to cancancan (activeadmin#5686)

9ea8e26


      Fix db tasks on development application

`db` is a whole namespace, not a specific task.

e71a4d8


      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.

98437ac


      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

f3abb0d


      Merge pull request activeadmin#5697 from activeadmin/fix_db_tasks_on_…

…dev_app

Fix db tasks on dev app


      Corrected syntax in comment (activeadmin#5700)

1c45e8c

gigorok/activeadmin forked from activeadmin/activeadmin

update origin from upstream #1

update origin from upstream #1

gigorok commented Mar 2, 2019

deivid-rodriguez added some commits Nov 26, 2018

deivid-rodriguez and others added some commits Jan 17, 2019

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

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

gigorok/activeadmin forked from activeadmin/activeadmin

Join GitHub today

update origin from upstream #1

Conversation

gigorok commented Mar 2, 2019

deivid-rodriguez added some commits Nov 26, 2018

deivid-rodriguez and others added some commits Jan 17, 2019

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

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

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