Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revert removal of requestAnimationFrame and move to a separate MR/discussionrefactor-emoji-utils | Mike Greiling | 2017-06-27 | 1 | -2/+8 |
| | |||||
* | rename getEmojiCategoryMap and remove unnecessary parameter | Mike Greiling | 2017-06-27 | 2 | -9/+9 |
| | |||||
* | move glEmojiTag method to emoji helper | Mike Greiling | 2017-06-27 | 6 | -87/+68 |
| | |||||
* | split emoji support methods from the async module | Mike Greiling | 2017-06-27 | 7 | -12/+16 |
| | |||||
* | export validEmojiNames for autocomplete | Mike Greiling | 2017-06-26 | 2 | -2/+3 |
| | |||||
* | replace emojiAlias references with normalizeEmojiName helper | Mike Greiling | 2017-06-26 | 1 | -5/+3 |
| | |||||
* | namespace emoji helper methods within AwardsHandler class | Mike Greiling | 2017-06-26 | 1 | -13/+8 |
| | |||||
* | move emoji category index to helper method | Mike Greiling | 2017-06-26 | 2 | -27/+32 |
| | |||||
* | move emojiAlias logic into helper module | Mike Greiling | 2017-06-26 | 2 | -16/+17 |
| | |||||
* | fix method definition styling | Mike Greiling | 2017-06-26 | 1 | -12/+2 |
| | |||||
* | move normalizeEmojiName method to emoji helper module | Mike Greiling | 2017-06-26 | 3 | -20/+14 |
| | |||||
* | remove problematic use of requestAnimationFrame | Mike Greiling | 2017-06-26 | 1 | -8/+2 |
| | |||||
* | update import locations for karma specs | Mike Greiling | 2017-06-23 | 2 | -4/+3 |
| | |||||
* | centralize emoji helper methods | Mike Greiling | 2017-06-23 | 7 | -21/+22 |
| | |||||
* | refactor option defaults | Mike Greiling | 2017-06-23 | 1 | -5/+2 |
| | |||||
* | Merge branch 'mk-fix-breadcrumb-order-33938' into 'master' | Douwe Maan | 2017-06-23 | 3 | -1/+18 |
|\ | | | | | | | | | | | | | Fix breadcrumb order Closes #33938 See merge request !12322 | ||||
| * | Add changelog entrymk-fix-breadcrumb-order-33938 | Michael Kozono | 2017-06-23 | 1 | -0/+4 |
| | | |||||
| * | Fix breadcrumb order | Michael Kozono | 2017-06-22 | 2 | -1/+14 |
| | | |||||
* | | Merge branch 'mk-fix-issue-34068' into 'master' | Douwe Maan | 2017-06-23 | 2 | -2/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix 500 on failure to create a private group Closes #34068 See merge request !12394 | ||||
| * | | Fix 500 on create group failures | Michael Kozono | 2017-06-23 | 2 | -2/+6 |
| | | | | | | | | | | | | Fixes #34068 | ||||
* | | | Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master' | Yorick Peterse | 2017-06-23 | 19 | -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-helper | Grzegorz Bizon | 2017-06-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helper | Grzegorz Bizon | 2017-06-22 | 439 | -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 migrations | Grzegorz Bizon | 2017-06-22 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fix specs for database migration helpers with transactions | Grzegorz Bizon | 2017-06-22 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Fix migration specs that can not run within transaction | Grzegorz Bizon | 2017-06-21 | 6 | -5/+7 |
| | | | | | |||||
| * | | | | Disable transactions in migrations that should not use it | Grzegorz Bizon | 2017-06-21 | 10 | -0/+21 |
| | | | | | |||||
| * | | | | Raise if updating columns in batches within a transaction | Grzegorz Bizon | 2017-06-21 | 2 | -21/+41 |
| | | | | | |||||
* | | | | | Merge branch '34219-extra-symbol-notifications-modal' into 'master' | Phil Hughes | 2017-06-23 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra symbol in notifications modal Closes #34219 See merge request !12417 | ||||
| * | | | | | Remove extra symbol in notifications modal34219-extra-symbol-notifications-modal | Annabel Dunstone Gray | 2017-06-23 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'commit-comments-limited-width' into 'master' | Annabel Dunstone Gray | 2017-06-23 | 7 | -12/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the width of commit & snippet comment sections Closes #20920 See merge request !12088 | ||||
| * | | | | | | Limit the width of commit & snippet comment sections | Phil Hughes | 2017-06-23 | 7 | -12/+23 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'project-readme-limited-width' into 'master' | Annabel Dunstone Gray | 2017-06-23 | 5 | -2/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the width of project READMEs Closes #20919 See merge request !12165 | ||||
| * | | | | | | Limit the width of project READMEs | Phil Hughes | 2017-06-23 | 5 | -2/+13 |
|/ / / / / / | |||||
* | | | | | | Merge branch ↵ | Grzegorz Bizon | 2017-06-23 | 3 | -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-beta | Grzegorz Bizon | 2017-06-22 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | add CHANGELOG.md entry for !12071 | Mike Greiling | 2017-06-21 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | rename DRIVER_VERSION environment variable to CHROME_DRIVER_VERSION | Mike Greiling | 2017-06-21 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | update chrome version and chromedriver | Mike Greiling | 2017-06-21 | 1 | -4/+8 |
| | | | | | | | |||||
| * | | | | | | Update Dockerfile to utilize the stable release of Google Chrome 59 | Mike Greiling | 2017-06-21 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'winh-promise-rejects-fail-tests' into 'master' | Phil Hughes | 2017-06-23 | 8 | -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 rejections | Winnie Hellmann | 2017-06-23 | 8 | -160/+257 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'hot-reload' into 'master' | Tim Zallmann | 2017-06-23 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hot reloading for .vue files Closes #33729 See merge request !12180 | ||||
| * | | | | | | | hot reloading for .vue fileshot-reload | Simon Knox | 2017-06-15 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '31574-bootstrap-form-builder' into 'master' | Phil Hughes | 2017-06-23 | 5 | -74/+53 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bootstrap_form gem See merge request !10985 | ||||
| * | | | | | | | | Convert app/views/profiles/show.html.haml to bootstrap_form | Nick Thomas | 2017-06-22 | 3 | -74/+50 |
| | | | | | | | | | |||||
| * | | | | | | | | Add bootstrap_form gem | Nick Thomas | 2017-06-22 | 2 | -0/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '33992-mr-target-avatar' into 'master' | Phil Hughes | 2017-06-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add padding to target branch container Closes #33992 See merge request !12353 | ||||
| * | | | | | | | | | Add padding to target branch container33992-mr-target-avatar | Annabel Dunstone Gray | 2017-06-21 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-sidebar-scroll-jump' into 'master' | Phil Hughes | 2017-06-23 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove layout nav from scroll calculation Closes #33984 See merge request !12399 |