summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adding NULL:false constraint with change_column_null instead of change_columnfix_set_null_false_migrationValery Sizov2017-05-181-4/+4
|
* 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
| * | | | | | | Replace EFS section in AWS guideDrew Blessing2017-05-172-13/+17
| | | | | | | |
| * | | | | | | Add warning about AWS EFS and performanceDrew Blessing2017-05-171-0/+17
| | | | | | | |
| * | | | | | | Consolidate opening text from about.gitlab.com and add active/passive noteDrew Blessing2017-05-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add opening text that was previously on https://about.gitlab.com/high-availability and add a note that active/passive is compatible but not supported.
* | | | | | | | Merge branch 'dm-tree-last-commit' into 'master'Dmitriy Zaporozhets2017-05-177-6/+25
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Show last commit for current tree on tree page See merge request !11442
| * | | | | | | Add spec for last commit info when browsing repository filesdm-tree-last-commitDmitriy Zaporozhets2017-05-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Show last commit for current tree on tree pageDouwe Maan2017-05-176-6/+13
| | | | | | | |
* | | | | | | | Merge branch '31483-ordered-task-list' into 'master' Clement Ho2017-05-172-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Ordered Task List Items Closes #31483 See merge request !11445
| * | | | | | | | Fix Ordered Task List ItemsJared Deckard2017-05-172-2/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'update-fe_guide-testing' into 'master' Clement Ho2017-05-172-9/+30
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update fe_guide testing.md See merge request !11385
| * | | | | | | Update fe_guide testing.mdLuke "Jared" Bennett2017-05-172-9/+30
|/ / / / / / /
* | | | | | | Merge branch 'dm-changelog-viewer' into 'master' Rémy Coutable2017-05-176-2/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CHANGELOG See merge request !11365
| * | | | | | | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-176-2/+52
|/ / / / / / /
* | | | | | | Merge branch '32085-improve-ee-compat-check' into 'master' Robert Speicher2017-05-171-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch CE/branch before running `git apply --check --3way patch` Closes #32085 See merge request !11412
| * | | | | | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-178-83/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use same last commit widget on project homepage and tree view Closes #32245 See merge request !11424
| * | | | | | Use same last commit widget on project homepage and tree viewdm-consistent-commit-widgetDouwe Maan2017-05-178-83/+13
| | | | | | |