Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 9.3.3v9.3.39-3-stable-patch-4 | James Edwards-Jones | 2017-06-30 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.3.3 | James Edwards-Jones | 2017-06-30 | 7 | -25/+9 |
| | | | [ci skip] | ||||
* | Merge branch '34461-top-banner-job' into '9-3-stable' | Phil Hughes | 2017-06-30 | 2 | -43/+49 |
|\ | | | | | | | | | Calculate top position with flash message after the request is received See merge request !12556 | ||||
| * | Calculate top position with flash message after the request is received | Filipa Lacerda | 2017-06-30 | 2 | -43/+49 |
|/ | |||||
* | Merge branch '9-3-stable-patch-3-mysql' into '9-3-stable' | James Edwards-Jones | 2017-06-30 | 31 | -90/+322 |
|\ | | | | | | | | | Prepare 9.3.3 Release See merge request !12508 | ||||
| * | Merge branch '34407-flickering-scroll-v1' into 'master'9-3-stable-patch-3-mysql | Annabel Dunstone Gray | 2017-06-29 | 1 | -3/+5 |
| | | | | | | | | | | | | | | Fix scroll flicker Closes #34407 See merge request !12501 | ||||
| * | Merge branch 'fix-34417' into 'master' | Sean McGivern | 2017-06-29 | 3 | -17/+48 |
| | | | | | | | | | | | | | | Perform housekeeping only when an import of a fresh project is completed Closes #34417 See merge request !12529 | ||||
| * | Merge branch 'highest-return-on-diff-investment' into 'master' | Sean McGivern | 2017-06-29 | 2 | -1/+5 |
| | | | | | | | | | | | | | | Bring back branches badge to main project page Closes #34438 See merge request !12548 | ||||
| * | Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master' | Rémy Coutable | 2017-06-29 | 1 | -1/+1 |
| | | | | | | | | | | Run mysql tests on stable preperation branches like 9-3-stable-patch-2 See merge request !12552 | ||||
| * | Merge branch 'issue-boards-closed-list-all' into 'master' | Sean McGivern | 2017-06-29 | 3 | -3/+15 |
| | | | | | | | | | | | | | | Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271 | ||||
| * | Merge branch 'issue-form-multiple-line-markdown-stable' into ↵ | Filipa Lacerda | 2017-06-29 | 3 | -36/+81 |
| |\ | | | | | | | | | | | | | | | | | | | '9-3-stable-patch-3-mysql' Issue form multiple line markdown stable See merge request !12549 | ||||
| | * | fixed tests against phantomjsissue-form-multiple-line-markdown-stable | Phil Hughes | 2017-06-29 | 1 | -1/+9 |
| | | | |||||
| | * | Fixed multi-line markdown in issue edit form | Phil Hughes | 2017-06-29 | 3 | -38/+75 |
| | | | | | | | | | | | | Closes #34318 | ||||
| * | | Merge branch 'gitaly-encodings' into 'master' | Robert Speicher | 2017-06-29 | 4 | -11/+44 |
| |/ | | | | | | | | | | | | | | | Fix gitaly ref encoding bugs Closes #34156 See merge request !12522 | ||||
| * | Merge branch '34430-fix-double-escape-comment-edit' into 'master' | Phil Hughes | 2017-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape` Closes #34430 See merge request !12505 | ||||
| * | Merge branch 'fix-head-pipeline-for-commit-status' into 'master' | Grzegorz Bizon | 2017-06-28 | 3 | -6/+28 |
| | | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478 | ||||
| * | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-06-28 | 1 | -3/+3 |
| | | | | | | | | | | Fix the numbering of steps in the 9.2 to 9.3 upgrade guide See merge request !12498 | ||||
| * | Merge branch 'dm-dependency-linker-newlines' into 'master' | Robert Speicher | 2017-06-28 | 3 | -1/+10 |
| | | | | | | | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package names Closes #34321 See merge request !12495 | ||||
| * | Merge branch 'winh-no-current-user-search-bar' into 'master' | Clement Ho | 2017-06-28 | 5 | -7/+80 |
| | | | | | | | | | | Add condition if there is a current user to DropdownUser See merge request !12415 | ||||
| * | Merge branch 'acet-fix-job-sidebar-overflow' into 'master' | Jacob Schatz | 2017-06-28 | 1 | -0/+1 |
|/ | | | | | | | Jobs: Fix job sidebar overflow issue. Closes #34080 See merge request !12366 | ||||
* | Update VERSION to 9.3.2v9.3.2 | Clement Ho | 2017-06-27 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.3.2 | Clement Ho | 2017-06-27 | 3 | -9/+5 |
| | | | [ci skip] | ||||
* | Merge branch '9-3-stable-patch-2' into '9-3-stable' | Clement Ho | 2017-06-28 | 29 | -39/+124 |
|\ | | | | | | | | | Prepare 9.3.2 See merge request !12493 | ||||
| * | Merge branch 'revert-99bdfd18' into '9-3-stable-patch-2'9-3-stable-patch-2 | Clement Ho | 2017-06-27 | 3 | -75/+38 |
| |\ | | | | | | | | | | | | | Revert "Merge branch 'issue-form-multiple-line-markdown' into 'master'" See merge request !12500 | ||||
| | * | Revert "Merge branch 'issue-form-multiple-line-markdown' into 'master'" | Clement Ho | 2017-06-27 | 3 | -75/+38 |
| |/ | | | | | This reverts merge request !12458 | ||||
| * | Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master' | Douwe Maan | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Update mmap2 gem to fix missing symbol error that happens on some installations from source Closes #34221 See merge request !12492 | ||||
| * | Merge branch 'backport-system-check-fix' into 'master' | Douwe Maan | 2017-06-27 | 2 | -0/+26 |
| | | | | | | | | | | Make the SimpleExecutor rescue exceptions in the executing Checks See merge request !12487 | ||||
| * | Merge branch '33933-fix-deployment-indicator-date' into 'master' | Robert Speicher | 2017-06-27 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | Fix bug where Service `created_at` time was used instead of deployment time. Closes #33933 See merge request !12395 | ||||
| * | Merge branch 'sh-fix-premailer-gem-for-filesystem' into 'master' | Robert Speicher | 2017-06-27 | 3 | -6/+12 |
| | | | | | | | | | | | | | | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets Closes #34231 See merge request !12456 | ||||
| * | Merge branch '34320-environment-detail-job' into 'master' | Filipa Lacerda | 2017-06-27 | 2 | -6/+9 |
| | | | | | | | | | | | | | | Truncate long job names in environment view; wrap author to next line Closes #34320 See merge request !12455 | ||||
| * | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵ | Robert Speicher | 2017-06-27 | 3 | -7/+19 |
| | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443 | ||||
| * | Merge branch 'issue-form-multiple-line-markdown' into 'master' | Filipa Lacerda | 2017-06-27 | 3 | -38/+75 |
| | | | | | | | | | | | | | | Fixed multi-line markdown in issue edit form Closes #34318 See merge request !12458 | ||||
| * | Merge branch '34168-cannot-edit-prioritized-labels-issues-with-firefox' into ↵ | Phil Hughes | 2017-06-27 | 4 | -3/+10 |
| | | | | | | | | | | | | | | | | | | 'master' Action Buttons on Prio Labels working again by setting pointer events to none on… Closes #34168 See merge request !12473 | ||||
| * | Merge branch '34282-fix-api-using-include_missing-false' into 'master' | Grzegorz Bizon | 2017-06-27 | 3 | -1/+16 |
| | | | | | | | | | | | | | | Fix optional arugments for POST :id/variables Closes #34282 See merge request !12474 | ||||
| * | Merge branch ↵ | Annabel Dunstone Gray | 2017-06-27 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | '34115-unable-to-access-edit-comment-from-dropdown-menu-in-certain-screen-sizes' into 'master' Resolve "Unable to access edit comment from dropdown menu in certain screen sizes" Closes #34115 See merge request !12421 | ||||
| * | Merge branch 'sh-revert-annotate-for-blame' into 'master' | Rémy Coutable | 2017-06-27 | 6 | -6/+5 |
| | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401 | ||||
| * | Merge branch ↵ | Clement Ho | 2017-06-27 | 2 | -5/+18 |
|/ | | | | | | | | | '34014-submitting-reply-to-existing-diff-discussion-using-cmd-ctrl-enter-submits-twice-and-refreshes-page' into 'master' Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" Closes #34014 See merge request !12352 | ||||
* | Update VERSION to 9.3.1v9.3.1 | Clement Ho | 2017-06-26 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.3.1 | Clement Ho | 2017-06-26 | 7 | -25/+9 |
| | | | [ci skip] | ||||
* | Merge branch 'fix-nested-group-spec-on-mysql' into 'master' | Robert Speicher | 2017-06-26 | 1 | -1/+1 |
| | | | | | Tag a spec as :nested_groups since it fails on MySQL See merge request !12459 | ||||
* | Merge branch 'update-9-3-templates' into '9-3-stable' | Clement Ho | 2017-06-26 | 31 | -34/+234 |
|\ | | | | | | | | | Update templates for 9.3 See merge request !12041 | ||||
| * | Update templates for 9.3 | kushalpandya | 2017-06-23 | 31 | -34/+234 |
| | | |||||
* | | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable' | Clement Ho | 2017-06-26 | 1 | -49/+59 |
|\ \ | | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12042 | ||||
| * | | Update dependencies list for 9.3 | kushalpandya | 2017-06-23 | 1 | -49/+59 |
| |/ | |||||
* | | Merge branch 'update-guides-for-9-3' into '9-3-stable' | Clement Ho | 2017-06-26 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Update guide for 9.3 See merge request !12038 | ||||
| * | | Update clone urls for 9.3 | kushalpandya | 2017-06-23 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch '9-3-stable-patch-1' into '9-3-stable' | Clement Ho | 2017-06-26 | 51 | -126/+379 |
|\ \ | |/ |/| | | | | | Prepare 9.3.1 See merge request !12404 | ||||
| * | Merge branch 'issue-inline-edit-quick-submit' into 'master'9-3-stable-patch-1 | Filipa Lacerda | 2017-06-26 | 6 | -2/+58 |
| | | | | | | | | | | | | | | Fixes ctrl+enter not submit issue edit form Closes #33758 See merge request !12422 | ||||
| * | Merge branch 'fix-34019' into 'master' | Sean McGivern | 2017-06-26 | 2 | -1/+20 |
| | | | | | | | | | | | | | | Perform project housekeeping after importing projects Closes #34019 See merge request !12323 | ||||
| * | Fix click not being able to find the current element to use trigger('click') ↵ | Filipa Lacerda | 2017-06-26 | 1 | -1/+1 |
| | | | | | | | | instead |