summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | [Migration guide] Add note about prefering change_column_null over change_columnchange_migration_style_guideValery Sizov2017-05-181-0/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix_set_null_false_migration' into 'master'Yorick Peterse2017-05-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding NULL:false constraint with change_column_null instead of change_column Closes #32450 See merge request !11471
| * | | | | | | | | | | | | Adding NULL:false constraint with change_column_null instead of change_columnfix_set_null_false_migrationValery Sizov2017-05-181-4/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/refactor-pipeline-schedules' into 'master'Sean Packham (GitLab)2017-05-188-48/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor pipeline schedules docs See merge request !11470
| * | | | | | | | | | | | | Refactor pipeline schedules docsAchilleas Pipinellis2017-05-188-48/+81
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '32359-align-resolve-btn' into 'master'Filipa Lacerda2017-05-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align resolve comment btn Closes #32359 See merge request !11457
| * | | | | | | | | | | | Align resolve comment btn32359-align-resolve-btnAnnabel Dunstone Gray2017-05-171-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sh-fix-container-registry-s3-redirects' into 'master'Kamil Trzciński2017-05-184-5/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle container registry redirects to fix metadata stored on an S3 backend Closes #22403 See merge request !11429
| * | | | | | | | | | | | | Properly handle container registry redirects to fix metadata stored on a S3 ↵sh-fix-container-registry-s3-redirectsStan Hu2017-05-174-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend The previous behavior would include the Authorization header, which would make fetching an S3 blob fail quietly. Closes #22403 Update sh-fix-container-registry-s3-redirects.yml
* | | | | | | | | | | | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵Phil Hughes2017-05-185-63/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472
| * | | | | | | | | | | | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-caseEric Eastwood2017-05-185-63/+144
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
* | | | | | | | | | | | | | Merge branch 'docs-add-api-to-all-headings' into 'master'Sean Packham (GitLab)2017-05-1828-33/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "API" to all respective headings (h1s) Closes #32307 See merge request !11450
| * | | | | | | | | | | | | | Add "API" to all respective headings (h1s)Marcia Ramos2017-05-1828-33/+24
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch ↵Phil Hughes2017-05-184-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32086-atwho-is-still-enabled-for-personal-snippet-comments-form' into 'master' Disable reference prefixes in notes for Snippets Closes #32086 See merge request !11278
| * | | | | | | | | | | | | Disable reference prefixes in notes for SnippetsSam Rose2017-05-184-6/+18
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'dz-codeclimate-doc' into 'master'Achilleas Pipinellis2017-05-183-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Code Climate CLI example to CI documentation See merge request !11368
| * | | | | | | | | | | | Add Code Climate CLI example to CI documentationDmitriy Zaporozhets2017-05-183-0/+30
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch ↵Phil Hughes2017-05-184-21/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled' into 'master' Automatically close user dropdown for CE Closes #31987 See merge request !11189
| * | | | | | | | | | | | Remove unnecessary hidden()31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabledClement Ho2017-05-171-2/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use to toggle the dropdownClement Ho2017-05-171-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix form specClement Ho2017-05-162-22/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add test.js and test.css to disable animations during testing and include ↵Luke "Jared" Bennett2017-05-165-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these in _head when testing
| * | | | | | | | | | | | Fix rubocopClement Ho2017-05-162-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into ↵Clement Ho2017-05-16692-3569/+7067
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled'
| * | | | | | | | | | | | | Fix conflict on users_selectClement Ho2017-05-121-606/+599
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove unnecessary commentClement Ho2017-05-121-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add additional EE checkClement Ho2017-05-112-5/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add helper to disable css animation in rspecClement Ho2017-05-113-37/+26
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix sidebar specClement Ho2017-05-091-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix issue specClement Ho2017-05-091-4/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add specClement Ho2017-05-092-0/+26
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Automatically close user dropdown for CEClement Ho2017-05-091-0/+9
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'patch-20' into 'master'Achilleas Pipinellis2017-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update link to documentation See merge request !11468
| * | | | | | | | | | | | | | Update link to documentationMax Raab2017-05-181-1/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '31693-move-db-name-to-last-part-of-job-name' into 'master'Rémy Coutable2017-05-182-124/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make the DB name a suffix of the first part of jobs' name" Closes #31693 See merge request !11042
| * | | | | | | | | | | | | | Reorganize static analysis and DB-related jobs31693-move-db-name-to-last-part-of-job-nameRémy Coutable2017-05-171-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Factorize common :only definition in .gitlab-ci.ymlRémy Coutable2017-05-171-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Move the DB name at the end of the first jobs' name word and prepend it with ↵Rémy Coutable2017-05-172-87/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a dash Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Revert "Merge branch 'revert-f2fc716c' into 'master' "Rémy Coutable2017-05-171-12/+12
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 98ae016ab207a7f4e27d151584156af6011d48d5, reversing changes made to c5dee301f8bb6496c09c2aef54f9665b350c535f.
* | | | | | | | | | | | | | Merge branch 'dm-readme-viewer' into 'master'Rémy Coutable2017-05-186-4/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for README See merge request !11366
| * | | | | | | | | | | | | Add auxiliary viewer for READMEdm-readme-viewerDouwe Maan2017-05-176-4/+31
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-issue-assignee-trigger' into 'master'Stan Hu2017-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if OLD is set when migrating issue assignees Closes #32439 See merge request !11461
| * | | | | | | | | | | | | Check if OLD is set when migrating issue assigneesYorick Peterse2017-05-171-1/+1
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The procedure for migrating issue assignees is invoked on both an INSERT and UPDATE. This means it will fail for INSERTs because OLD is set to NULL in this case.
* | | | | | | | | | | | | Merge branch 'issue_32428' into 'master'Robert Speicher2017-05-171-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'no changes' entries from changelog Closes #32428 See merge request !11462
| * | | | | | | | | | | | | Remove 'no changes' entries from changelogissue_32428Felipe Artur2017-05-171-3/+0
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zj-fix-migration' into 'master'Robert Speicher2017-05-171-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix data migration from trigger schedules See merge request !11460
| * | | | | | | | | | | | Fix data migration from trigger schedulesZ.J. van de Weg2017-05-171-0/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs-fix-ee-compat' into 'master'Douwe Maan2017-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid object reference in ee_compat_check script See merge request !11455
| * | | | | | | | | | | | Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compatRobert Speicher2017-05-171-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs-update-ha' into 'master'Stan Hu2017-05-173-10/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs update ha See merge request !11446