summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | | Remove layout nav from scroll calculationfix-sidebar-scroll-jumpAnnabel Dunstone Gray2017-06-221-3/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch '34095-permalinks' into 'master'Phil Hughes2017-06-232-3/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix offset for fixed nav Closes #34095 See merge request !12365
| | | * | | | | | | | | | | | | | | | | Fix offset for fixed navAnnabel Dunstone Gray2017-06-232-3/+14
| | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch 'notes-es-class-syntax' into 'master'Tim Zallmann2017-06-231-1374/+1356
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Notes into ES class syntax See merge request !12254
| | | * | | | | | | | | | | | | | | | | refactor Notes class to ES class syntaxnotes-es-class-syntaxMike Greiling2017-06-221-1374/+1356
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'dm-unnecessary-top-padding' into 'master'Sean McGivern2017-06-232-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary top padding on group MR index See merge request !12392
| | | * | | | | | | | | | | | | | | | | | Remove unnecessary top padding on group MR indexdm-unnecessary-top-paddingDouwe Maan2017-06-222-2/+5
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch '34120-environment-detail-bug' into 'master'Phil Hughes2017-06-233-9/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mobile environment detail view Closes #34120 See merge request !12382
| | | * | | | | | | | | | | | | | | | | Fix mobile environment detail viewAnnabel Dunstone Gray2017-06-233-9/+11
| | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch 'project-settings-container-width' into 'master'Annabel Dunstone Gray2017-06-2312-50/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added limited width container to project settings See merge request !12045
| | | * | | | | | | | | | | | | | | | Added limited width container to project settingsPhil Hughes2017-06-2012-50/+52
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'fix-dropdown-top-navbar-position-mobile' into 'master'Annabel Dunstone Gray2017-06-232-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dropdown position for the new button on mobile for the top navbar Closes #34139 See merge request !12388
| | | * | | | | | | | | | | | | | | | Fix dropdown position for the new button on mobile for the top navbarJose Ivan Vargas Lopez2017-06-232-0/+6
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-223-17/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'rs-bootsnap' into 'master'" Closes #34134, #34106, and #34084 See merge request !12389
| | | * | | | | | | | | | | | | | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-223-17/+0
| | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc.
| | * | | | | | | | | | | | | | | Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' ↵Annabel Dunstone Gray2017-06-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve ""Add Members" drop-down doesn't separate Name/Username" Closes #33981 See merge request !12376
| | | * | | | | | | | | | | | | | | Resolve ""Add Members" drop-down doesn't separate Name/Username"Tim Zallmann2017-06-221-1/+1
| | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master'Yorick Peterse2017-06-222-14/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `datetime_with_timezone` to table definition See merge request !12292
| | | * | | | | | | | | | | | | | | Fix MySQL schema dump for `timestamp`mk-add-datetime-with-timezone-table-definitionMichael Kozono2017-06-221-4/+30
| | | | | | | | | | | | | | | | | |