summaryrefslogtreecommitdiff
Commit message (Collapse)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
|\ | | | | | | | | | | | | Fix breadcrumb order Closes #33938 See merge request !12322
| * 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 failure to create a private group Closes #34068 See merge request !12394
| * | Fix 500 on create group failuresMichael Kozono2017-06-232-2/+6
| | | | | | | | | | | | Fixes #34068
* | | Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'Yorick Peterse2017-06-2319-30/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve `update_column_in_batches` migration helper Closes #34064 See merge request !12350
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (56 commits) File view buttons Don't reset the session when the example failed, because we need capybara-screenshot to have access to it Resolve "MR comment + system note highlight don't have the same width" Add feature spec for dashboard state filter tabs Wording of Mysql support. a new feature checklist and more elaborate documentation requirements Filter archived project in API v3 only if param present Revert to using links instead of buttons in Issuable Index tabs. Do not run the codeclimate job on docs-only changes Only show gray footer space if environment actions exist Migrate Gitlab::Git::Blob.find to Gitaly Backport filtered search lazy token consistent state fix Add a comment explaining how the branch clean up happens Fix Github::Representation::PullRequest#source_branch_exists? Add CHANGELOG Fix GitHub importer performance on branch existence check Rebuild the dynamic path before validating it Rename stage ref migration specs to match a class name Enable Style/DotPosition Rubocop :cop: Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" ... Conflicts: db/post_migrate/20170526185921_migrate_build_stage_reference.rb
| * | | | 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 modal Closes #34219 See merge request !12417
| * | | | | 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 sections Closes #20920 See merge request !12088
| * | | | | | 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 READMEs Closes #20919 See merge request !12165
| * | | | | | Limit the width of project READMEsPhil Hughes2017-06-235-2/+13
|/ / / / / /
* | | | | | Merge branch ↵Grzegorz Bizon2017-06-233-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta' into 'master' Update QA Dockerfile to use stable Chrome package Closes #33538 See merge request !12071
| * | | | | | 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 rejections Closes #33845 and #33623 See merge request !12264
| * | | | | | | 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 files Closes #33729 See merge request !12180
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bootstrap_form gem See merge request !10985
| * | | | | | | | 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 container Closes #33992 See merge request !12353
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove layout nav from scroll calculation Closes #33984 See merge request !12399