summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix gitlab rake:import:repos tasksh-import-repos-fix-9-5Stan Hu2017-10-025-1/+28
| | | | | | | | | | | | | This backports !14597 for the 9.5.x branch. Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682
* Update VERSION to 9.5.6v9.5.69-5-stable-patch-7Jose Ivan Vargas2017-09-291-1/+1
|
* Update CHANGELOG.md for 9.5.6Jose Ivan Vargas2017-09-295-21/+7
| | | [ci skip]
* Merge branch '38319-9-5-stable' into '9-5-stable-patch-6'9-5-stable-patch-6Jose Ivan Vargas Lopez2017-09-285-6/+88
|\ | | | | | | | | Handle error when fetching ref for MR with deleted source branch See merge request gitlab-org/gitlab-ce!14550
| * Handle error when fetching ref for MR with deleted source branch38319-9-5-stableSean McGivern2017-09-285-6/+88
| | | | | | | | | | | | If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour.
* | Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-09-282-5/+6
| | | | | | | | | | | | Upgrade Nokogiri because of CVE-2017-9050 See merge request gitlab-org/gitlab-ce!14427
* | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-283-2/+12
| | | | | | | | | | | | | | Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
* | Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'Fatih Acet2017-09-2810-25/+157
| | | | | | | | | | | | | | Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
* | Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-284-3/+16
|/ | | | | | | Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
* Update VERSION to 9.5.5v9.5.5Simon Knox2017-09-181-1/+1
|
* Update CHANGELOG.md for 9.5.5Simon Knox2017-09-1817-84/+19
| | | [ci skip]
* Merge branch ↵9-5-stable-patch-5Grzegorz Bizon2017-09-153-6/+6
| | | | | | | | | '36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
* Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-152-4/+15
| | | | | | | | | | | | | Fix: GPG tmp dir removal race condition Ignore any errors when removing the tmp directory, as we may run into a race condition: The `gpg-agent` agent process may clean up some files as well while `FileUtils.remove_entry` is iterating the directory and removing all its contained files and directories recursively, which could raise an error. Closes #36998 See merge request !14194
* Merge branch '9-5-stable' into '9-5-stable-patch-5'Simon Knox2017-09-167-6/+67
|\ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch 'issue_37640_9_5_stable' into '9-5-stable'Grzegorz Bizon2017-09-157-6/+67
| |\ | | | | | | | | | | | | Fix project feature being deleted when updating project with invalid visibility level See merge request gitlab-org/gitlab-ce!14235
| | * Fix migrationsissue_37640_9_5_stableFelipe Artur2017-09-143-17/+6
| | |
| | * Add migration to fix corrupted projectsFelipe Artur2017-09-144-3/+47
| | |
| | * Fix project feature being deleted when updating project with invalid ↵Felipe Artur2017-09-125-5/+33
| |/ | | | | | | visibility level
* | Merge branch ↵Kamil Trzciński2017-09-133-1/+9
| | | | | | | | | | | | | | 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
* | Merge branch '9-5-stable-patch-5-1' into '9-5-stable-patch-5'Simon Knox2017-09-1221-161/+216
|\ \ | | | | | | | | | | | | Pick for 9.5: "Refactor how we fetch ref for merge requests" See merge request !14213
| * | Merge branch '36089-handle-ref-failure-better' into 'master'9-5-stable-patch-5-1Douwe Maan2017-09-1221-161/+216
|/ / | | | | | | | | | | | | | | Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
* | remove tests that should have been revertedSimon Knox2017-09-121-18/+0
| |
* | fix docs-list task - update docs in previous locationSimon Knox2017-09-123-248/+3
| | | | | | | | alternative is to pick !13872
* | change committer back to user for specSimon Knox2017-09-121-3/+3
| | | | | | | | changed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13984/
* | Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-09-114-0/+67
| | | | | | | | | | | | | | | | Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
* | Revert "Merge branch 'sidebar-cache-updates' into 'master'"Jose Ivan Vargas2017-09-115-56/+0
| | | | | | | | | | This reverts commit dd406182cb3529c3616097703b7d4dec49a3cb39, reversing changes made to d5d249764350b07340ed45068361d7249b3cf641.
* | Merge branch 'feature/gpg-verification-status' into 'master'Douwe Maan2017-09-0840-282/+863
| | | | | | | | | | | | GPG signature must match the committer in order to be verified See merge request !13771
* | Merge branch 'perf.slow-issuable' into 'master'Sean McGivern2017-09-083-19/+74
| | | | | | | | | | | | | | | | Perf.slow issuable Closes #32844 See merge request !13685
* | Merge branch 'sidebar-cache-updates' into 'master'Sean McGivern2017-09-085-0/+95
| | | | | | | | | | | | Only update the sidebar count caches when needed See merge request !13878
* | Merge branch 'check-trigger-permissions-mysql' into 'master'Douwe Maan2017-09-086-8/+198
| | | | | | | | | | | | | | | | Improve migrations using triggers Closes #36633 See merge request !13666
* | Merge branch 'new-sidebar-scss-fix' into '9-5-stable-patch-5'Tim Zallmann2017-09-081-3/+16
|\ \ | | | | | | | | | | | | Fix new_sidebar.scss being out of date See merge request !14035
| * | Fix new_sidebar.scss being out of datenew-sidebar-scss-fixPhil Hughes2017-09-041-6/+18
| | |
* | | Merge branch '36821-fix-new-nav-wrapping-caret-and-increasing-height' into ↵Annabel Dunstone Gray2017-09-082-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix new navigation wrapping caret and increasing height Closes #36821 See merge request !13967
* | | Merge branch '37331-button-MR-widget' into 'master'Clement Ho2017-09-082-4/+11
| | | | | | | | | | | | | | | | | | | | | Fix buttons with different height in merge request widget Closes #37331 See merge request !14000
* | | Merge branch 'bvl-increase-storage-check-timeout' into 'master'Douwe Maan2017-09-081-1/+1
| | | | | | | | | | | | | | | Increase the timeout before aborting a storage access attempt See merge request !14023
* | | Merge branch '37406-success-status-icon' into 'master'Phil Hughes2017-09-084-2/+8
| | | | | | | | | | | | | | | | | | | | | Creates an icon only for the discussions and puts back the old SVG for CI status Closes #37406 See merge request !14042
* | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-083-56/+147
| | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083
* | | Merge branch '37288-fix-wrong-header-when-testing-webhook' into 'master'Douwe Maan2017-09-086-18/+34
| | | | | | | | | | | | | | | | | | | | | Fix a wrong `X-Gitlab-Event` header when testing webhooks Closes #37288 See merge request !14108
* | | Merge branch 'docs-confidential-issue' into 'master'Achilleas Pipinellis2017-09-088-5/+24
| | | | | | | | | | | | | | | | | | | | | Update docs for confidential issues Closes #36352 See merge request !14117
* | | Merge branch '36589-hide-group-name-on-collapse' into 'master'Clement Ho2017-09-081-3/+2
| | | | | | | | | | | | | | | | | | | | | Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
* | | Merge branch '36882-disable-gitlab-project-import-button-if-source-disabled' ↵Filipa Lacerda2017-09-082-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Disable GitLab Project Import Button if source disabled Closes #36882 See merge request !13789
* | | Merge branch '35441-fix-division-by-zero' into 'master'Robert Speicher2017-09-083-16/+32
| | | | | | | | | | | | | | | | | | | | | Fix division by zero for blame age map Closes #35441 See merge request !13803
* | | Merge branch ↵Clement Ho2017-09-083-6/+24
| |/ |/| | | | | | | | | | | | | | | | | '36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button' into 'master' Normalize styles for empty-state group-level new issue/MR combo button Closes #36638 See merge request !13647
* | Merge remote-tracking branch 'com-ce/9-5-stable' into 9-5-stableJose Ivan Vargas2017-09-071-0/+5
|\ \
| * | Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-09-064-30/+33
| |/ | | | | | | | | Upgrade mail and nokogiri gems due to security issues See merge request !13662
* | Update VERSION to 9.5.4v9.5.4Jose Ivan Vargas2017-09-061-1/+1
| |
* | Update CHANGELOG.md for 9.5.4Jose Ivan Vargas2017-09-068-30/+10
| | | | | | [ci skip]
* | Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-09-064-30/+33
| | | | | | | | | | Upgrade mail and nokogiri gems due to security issues See merge request !13662
* | Merge branch 'fix-comment-reflection' into 'security-9-5'Jacob Schatz2017-09-062-4/+21
|\ \ | | | | | | | | | | | | Fix Live Comment XSS Vulnerability See merge request gitlab/gitlabhq!2183
| * | Added missing at signJose Ivan Vargas2017-09-051-3/+3
| | |