summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revert removal of requestAnimationFrame and move to a separate MR/discussionrefactor-emoji-utilsMike Greiling2017-06-271-2/+8
* rename getEmojiCategoryMap and remove unnecessary parameterMike Greiling2017-06-272-9/+9
* move glEmojiTag method to emoji helperMike Greiling2017-06-276-87/+68
* split emoji support methods from the async moduleMike Greiling2017-06-277-12/+16
* export validEmojiNames for autocompleteMike Greiling2017-06-262-2/+3
* replace emojiAlias references with normalizeEmojiName helperMike Greiling2017-06-261-5/+3
* namespace emoji helper methods within AwardsHandler classMike Greiling2017-06-261-13/+8
* move emoji category index to helper methodMike Greiling2017-06-262-27/+32
* move emojiAlias logic into helper moduleMike Greiling2017-06-262-16/+17
* fix method definition stylingMike Greiling2017-06-261-12/+2
* move normalizeEmojiName method to emoji helper moduleMike Greiling2017-06-263-20/+14
* remove problematic use of requestAnimationFrameMike Greiling2017-06-261-8/+2
* update import locations for karma specsMike Greiling2017-06-232-4/+3
* centralize emoji helper methodsMike Greiling2017-06-237-21/+22
* refactor option defaultsMike Greiling2017-06-231-5/+2
* Merge branch 'mk-fix-breadcrumb-order-33938' into 'master'Douwe Maan2017-06-233-1/+18
|\
| * Add changelog entrymk-fix-breadcrumb-order-33938Michael Kozono2017-06-231-0/+4
| * Fix breadcrumb orderMichael Kozono2017-06-222-1/+14
* | Merge branch 'mk-fix-issue-34068' into 'master'Douwe Maan2017-06-232-2/+6
|\ \
| * | Fix 500 on create group failuresMichael Kozono2017-06-232-2/+6
* | | Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'Yorick Peterse2017-06-2319-30/+77
|\ \ \
| * | | Fix Rubocop offense in migration helpers specsfix/gb/improve-updating-column-in-batches-helperGrzegorz Bizon2017-06-221-1/+1
| * | | Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helperGrzegorz Bizon2017-06-22439-3577/+4596
| |\ \ \
| * | | | Disable transaction in specs for some migrationsGrzegorz Bizon2017-06-222-2/+2
| * | | | Fix specs for database migration helpers with transactionsGrzegorz Bizon2017-06-221-2/+8
| * | | | Fix migration specs that can not run within transactionGrzegorz Bizon2017-06-216-5/+7
| * | | | Disable transactions in migrations that should not use itGrzegorz Bizon2017-06-2110-0/+21
| * | | | Raise if updating columns in batches within a transactionGrzegorz Bizon2017-06-212-21/+41
* | | | | Merge branch '34219-extra-symbol-notifications-modal' into 'master'Phil Hughes2017-06-231-1/+1
|\ \ \ \ \
| * | | | | Remove extra symbol in notifications modal34219-extra-symbol-notifications-modalAnnabel Dunstone Gray2017-06-231-1/+1
* | | | | | Merge branch 'commit-comments-limited-width' into 'master'Annabel Dunstone Gray2017-06-237-12/+23
|\ \ \ \ \ \
| * | | | | | Limit the width of commit & snippet comment sectionsPhil Hughes2017-06-237-12/+23
|/ / / / / /
* | | | | | Merge branch 'project-readme-limited-width' into 'master'Annabel Dunstone Gray2017-06-235-2/+13
|\ \ \ \ \ \
| * | | | | | Limit the width of project READMEsPhil Hughes2017-06-235-2/+13
|/ / / / / /
* | | | | | Merge branch '33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-i...Grzegorz Bizon2017-06-233-5/+13
|\ \ \ \ \ \
| * | | | | | Update chrome version and the binary path33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-betaGrzegorz Bizon2017-06-222-2/+2
| * | | | | | add CHANGELOG.md entry for !12071Mike Greiling2017-06-211-0/+4
| * | | | | | rename DRIVER_VERSION environment variable to CHROME_DRIVER_VERSIONMike Greiling2017-06-211-2/+2
| * | | | | | update chrome version and chromedriverMike Greiling2017-06-211-4/+8
| * | | | | | Update Dockerfile to utilize the stable release of Google Chrome 59Mike Greiling2017-06-211-3/+3
* | | | | | | Merge branch 'winh-promise-rejects-fail-tests' into 'master'Phil Hughes2017-06-238-160/+257
|\ \ \ \ \ \ \
| * | | | | | | Make JavaScript tests fail for unhandled Promise rejectionsWinnie Hellmann2017-06-238-160/+257
|/ / / / / / /
* | | | | | | Merge branch 'hot-reload' into 'master'Tim Zallmann2017-06-231-0/+4
|\ \ \ \ \ \ \
| * | | | | | | hot reloading for .vue fileshot-reloadSimon Knox2017-06-151-0/+4
* | | | | | | | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-235-74/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert app/views/profiles/show.html.haml to bootstrap_formNick Thomas2017-06-223-74/+50
| * | | | | | | | Add bootstrap_form gemNick Thomas2017-06-222-0/+3
* | | | | | | | | Merge branch '33992-mr-target-avatar' into 'master'Phil Hughes2017-06-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add padding to target branch container33992-mr-target-avatarAnnabel Dunstone Gray2017-06-211-1/+1
* | | | | | | | | | Merge branch 'fix-sidebar-scroll-jump' into 'master'Phil Hughes2017-06-231-3/+1
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status