summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove test_after_commit gem.rails-5Connor Shea2017-02-232-4/+0
* Fix superclass mismatch. DelegateClass wouldLin Jen-Shin2017-02-231-1/+1
* Fix monkey patch.Connor Shea2017-02-231-2/+6
* Silence deprecations in test for now.Connor Shea2017-02-234-23/+10
* Use rails-controller-testing masterConnor Shea2017-02-233-47/+11
* Fix deprecation warning.Connor Shea2017-02-231-1/+1
* Test replacing sort methods with sort2.Connor Shea2017-02-2321-38/+37
* Starting the update to Rails 5, updating gems and changing deprecated methods.Connor Shea2017-02-2326-119/+267
* Merge branch 'enable-rspec-be_eql-cop' into 'master' Robert Speicher2017-02-234-8/+8
|\
| * Enable the RSpec/BeEql copenable-rspec-be_eql-copRémy Coutable2017-02-234-8/+8
* | Merge branch '28610-white-square-nav' into 'master' Filipa Lacerda2017-02-231-6/+10
|\ \
| * | Fix white square and sidebar animation28610-white-square-navAnnabel Dunstone Gray2017-02-231-6/+10
* | | Merge branch 'jej-contributing-styleguide-for-method-chaining' into 'master' Robert Speicher2017-02-231-1/+1
|\ \ \
| * | | Switched CONTRIBUTING.md style guide recommendation for method chainingJames Edwards-Jones2017-02-231-1/+1
* | | | Merge branch 'fix-git-access-specs' into 'master' Rémy Coutable2017-02-231-5/+14
|\ \ \ \
| * | | | Fix GitAccess specsfix-git-access-specsSean McGivern2017-02-231-5/+14
| | |/ / | |/| |
* | | | Merge branch '28450-test-compiling-frontend-assets-for-production-in-ci' into...Jacob Schatz2017-02-237-6/+94
|\ \ \ \ | |_|/ / |/| | |
| * | | add CHANGELOG.md entry for !939628450-test-compiling-frontend-assets-for-production-in-ciMike Greiling2017-02-211-0/+4
| * | | approve opener license (MIT)Mike Greiling2017-02-211-0/+6
| * | | add webpack bundle analyzer to production outputMike Greiling2017-02-215-7/+73
| * | | add production asset compile step to CI configMike Greiling2017-02-201-0/+12
* | | | Merge branch 'master' into 'master' Clement Ho2017-02-236-1/+103
|\ \ \ \
| * | | | on branch deletion show loading icon and disabled the buttonwendy04022017-02-226-1/+103
* | | | | Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-23340-1538/+1561
|\ \ \ \ \
| * | | | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-232-6/+6
| * | | | | Stylistic tweaksDouwe Maan2017-02-236-21/+21
| * | | | | Fix OAuth/SAML user blocking behaviorDouwe Maan2017-02-231-1/+3
| * | | | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-23191-884/+886
| * | | | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-23466-3228/+3228
| * | | | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-2332-59/+62
| * | | | | Manually correct autocorrectDouwe Maan2017-02-232-2/+4
| * | | | | Move up delegate callsDouwe Maan2017-02-238-29/+25
| * | | | | Exclude migrations from Style/MutableConstantDouwe Maan2017-02-2335-44/+47
| * | | | | ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-232-6/+5
| * | | | | Update haml_lint to work with newest rubocopDouwe Maan2017-02-232-6/+6
| * | | | | Add explanations to copsDouwe Maan2017-02-231-0/+61
| * | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-234-16/+9
| * | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-233-55/+74
| * | | | | Order cops alphabeticallyDouwe Maan2017-02-231-121/+123
| * | | | | Don’t exclude some file in lib from rubocopDouwe Maan2017-02-2335-213/+201
| * | | | | Fix new offensesDouwe Maan2017-02-2318-62/+67
| * | | | | Enable Rails/DelegateDouwe Maan2017-02-2325-110/+39
| * | | | | Enable Style/WordArrayDouwe Maan2017-02-2369-164/+159
| * | | | | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-2320-103/+98
| * | | | | Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-2311-96/+133
| * | | | | Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-235-1/+49
| * | | | | Enable Style/ClassCheckDouwe Maan2017-02-2311-12/+12
| * | | | | Regenerate .rubocop_todo.ymlDouwe Maan2017-02-231-276/+61
| * | | | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-23466-3215/+3215
| * | | | | Fix another specDouwe Maan2017-02-231-1/+1