summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.10.0-rc7v11.10.0-rc7GitLab Release Tools Bot2019-04-151-1/+1
|
* Merge branch '11-10-stable-prepare-rc7' into '11-10-stable'John Skarbek2019-04-13159-102/+4287
|\ | | | | | | | | Prepare 11.10.0-rc7 release See merge request gitlab-org/gitlab-ce!27289
| * Merge branch 'sh-revert-untrusted-chrome-repo' into 'master'11-10-stable-prepare-rc7Douglas Barbosa Alexandre2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'" See merge request gitlab-org/gitlab-ce!27329 (cherry picked from commit c1ce15d687cfcc4e4b20b05f570a80507ad5cc24) 81566392 Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'"
| * Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵Stan Hu2019-04-123-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322 (cherry picked from commit 6fbfa0607662197817dec0698362271a7b432e6d) b9b2897b Always return the deployment in the execute method 0723df52 Add CHANGELOG entry
| * Merge branch ↵Fatih Acet2019-04-122-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | '60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished' into 'master' Breakpoints.isDesktop should not always return false Closes #60369 See merge request gitlab-org/gitlab-ce!27240 (cherry picked from commit 44be329d59bc20598c2c2f310d4f3029c8dd25a9) 9dca4f12 Fix isDesktop function to return proper value
| * Merge branch '60241-merge-request-popover-doesn-t-go-away-on-mouse-leave' ↵Phil Hughes2019-04-123-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge Request popover doesn't go away on mouse leave" Closes #60241 See merge request gitlab-org/gitlab-ce!27143 (cherry picked from commit 9edb5d47808fe9618aed0f411c6b5aebbaadd42a) 2ea409f6 Fix bug where MR Popover wont go away
| * Merge branch 'if-external_auth-11-10' into '11-10-stable-prepare-rc7'John Jarvis2019-04-12103-35/+3058
| |\ | | | | | | | | | | | | Backport "Move Authorize project access with external service to Core" to 11.10 See merge request gitlab-org/gitlab-ce!27317
| | * Move Contribution Analytics related spec in ↵Imre Farkas2019-04-12103-35/+3058
| |/ | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
| * Merge branch 'id-undefined-pages-for-wiki-page' into 'master'Douwe Maan2019-04-122-4/+8
| | | | | | | | | | | | | | | | | | Fix grouping wiki pages by directory See merge request gitlab-org/gitlab-ce!27294 (cherry picked from commit c61fd077a42b1498dc82cc5fb17a0efcc9d758d5) 0595bbff Fix grouping wiki pages by directory
| * Merge branch '11-10-stable-prepare-rc7-pick-27205' into ↵John Jarvis2019-04-126-17/+79
| |\ | | | | | | | | | | | | | | | | | | '11-10-stable-prepare-rc7' Backport: Process at most 4 pipelines during push See merge request gitlab-org/gitlab-ce!27308
| | * Backport limit-amount-of-created-pipelines to 11.1011-10-stable-prepare-rc7-pick-27205Kamil Trzciński2019-04-123-2/+11
| | |
| | * Merge branch 'limit-amount-of-created-pipelines' into 'master'Grzegorz Bizon2019-04-124-15/+68
| |/ | | | | | | | | | | Process at most 4 pipelines during push See merge request gitlab-org/gitlab-ce!27205
| * Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-1226-27/+963
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172 (cherry picked from commit 0276b8682e37d361adbd1ac89d9ba6992f0d1b60) cd9ae6bb Revert "Remove HipChat integration from GitLab" 38d8616e Add changelog entry 69544c1e Fix UrlBlocker spec e00c7016 Add frozen_string_literal to HipChat files a409a77d Restore index on services.type
| * Merge branch 'diff-fluid-layout-fix' into 'master'Kushal Pandya2019-04-124-2/+18
| | | | | | | | | | | | | | | | | | | | | | Fixed fluid layout preference not being respected in diffs Closes #52916 See merge request gitlab-org/gitlab-ce!27302 (cherry picked from commit ca8c35285eedb0ae6e9a52fe377ec0b3ae9ada1a) 45ef6fd7 Fixed fluid layout preference not being respected in diffs
| * Merge branch 'sh-allow-unauth-chrome' into 'master'Grzegorz Bizon2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Allow unauthenticated downloads of Chrome Closes #60441 See merge request gitlab-org/gitlab-ce!27297 (cherry picked from commit 026c92d5fa82fac87386d5691c3d5b1e02f2eb5e) 84d6dd3e Allow unauthenticated downloads of Chrome
| * Merge branch 'qa-staging-53-quarantine-issue-suggesstions-spec' into 'master'Rémy Coutable2019-04-121-1/+2
| | | | | | | | | | | | | | | | | | Quarantine Issue suggestions spec See merge request gitlab-org/gitlab-ce!27259 (cherry picked from commit ec7804444343cef3562d88aab2d255287a215430) 5e640ee0 Qurantine Issue suggestions spec
| * Merge branch 'sh-disable-diff-instrumentation' into 'master'Michael Kozono2019-04-122-1/+5
| | | | | | | | | | | | | | | | | | | | | | Disable method instrumentation for diffs Closes #52898 See merge request gitlab-org/gitlab-ce!27235 (cherry picked from commit b9e6e72501173c29a30ee1b4a2afb9ee9d3b1117) b397ad8a Disable method instrumentation for diffs
| * Merge branch '60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling' ↵Annabel Dunstone Gray2019-04-122-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Long file names in MR diffs cause horizontal scrolling" Closes #60304 See merge request gitlab-org/gitlab-ce!27233 (cherry picked from commit 225ddd146d3a575401c7592417d486e7e5833996) 5b2b9fe0 Only make margin-auto on large screens for diff file header
| * Merge branch 'fixed-web-ide-merge-request-review' into 'master'Kushal Pandya2019-04-124-0/+47
| | | | | | | | | | | | | | | | | | | | | | Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225 (cherry picked from commit 423f82d41125ef2a6bfafb0d963dafd52ba656db) 1d04ae74 Fixes Web IDE not loading merge request files
| * Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'Sean McGivern2019-04-123-1/+13
|/ | | | | | | | | | | Guard against nil dereferenced_target Closes #60076 See merge request gitlab-org/gitlab-ce!27192 (cherry picked from commit dd019c2e0b6e292fb55ed264c430eec4a13c0c6b) 674b926e Guard against nil dereferenced_target
* Update VERSION to 11.10.0-rc6v11.10.0-rc6GitLab Release Tools Bot2019-04-111-1/+1
|
* Merge branch '11-10-stable-prepare-rc6' into '11-10-stable'John Jarvis2019-04-111848-11287/+1204
|\ | | | | | | | | Prepare 11.10.0-rc6 release See merge request gitlab-org/gitlab-ce!27232
| * Merge branch 'revert-24704-download-repository-path-11-10-rc6' into ↵John Jarvis2019-04-1118-136/+63
| |\ | | | | | | | | | | | | | | | | | | '11-10-stable-prepare-rc6' Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27251
| | * Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-path-11-10-rc6Patrick Bajao2019-04-1118-136/+63
| |/ | | | | | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
| * Removed also the in the meanwhile introduced rake taskTim Zallmann2019-04-101-9/+1
| |
| * Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"Tim Zallmann2019-04-101808-11102/+182
| | | | | | | | Reverts the loading of emojis and its images to move forward with RC
| * Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-1016-35/+942
| | | | | | | | | | | | | | | | Git push options to create a merge request, set target_branch and set merge when pipeline succeeds Closes #53198 and #43263 See merge request gitlab-org/gitlab-ce!26752
| * Merge branch 'update-workhorse-8-5-1' into 'master'Sean McGivern2019-04-102-1/+6
| | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v8.5.1 See merge request gitlab-org/gitlab-ce!27217 (cherry picked from commit fc1dfae41c7e6e1bbaa95bc4a1e087ffddfcc57b) 44b1597e Update GitLab Workhorse to v8.5.1
| * Merge branch 'tp-2019-04-08-quarantine' into 'master'Ramya Authappan2019-04-102-3/+4
| | | | | | | | | | | | | | | | | | Quarantine failing nightly tests See merge request gitlab-org/gitlab-ce!27174 (cherry picked from commit aa875163df0f1e386f3acdc8dda19de8a9183534) aa02f65e Quarantine failing nightly tests
| * Merge branch 'fix-cluster-health-ce' into 'master'Sean McGivern2019-04-102-1/+6
|/ | | | | | | | | | | | | | | Correct path to cluster health partial Closes gitlab-ee#10990 See merge request gitlab-org/gitlab-ce!27107 (cherry picked from commit 94d9de694ec75f118077010e696f13150cd30cc7) bf611f3e Correct path to cluster health partial c52946eb Add helper to check clusters/_health conditional d3430fbd Rename clusters/health partial 7dbb5d64 Move helper to ee 51b8d34f Pass cluster as parameter to helper
* Update VERSION to 11.10.0-rc5v11.10.0-rc5GitLab Release Tools Bot2019-04-101-1/+1
|
* Merge branch '11-10-stable' of dev.gitlab.org:gitlab/gitlabhq into 11-10-stableJohn Jarvis2019-04-101-1/+1
|\
| * Update VERSION to 11.10.0-rc4v11.10.0-rc4GitLab Release Tools Bot2019-04-091-1/+1
| |
* | Merge branch '11-10-stable-prepare-rc5' into '11-10-stable'John Jarvis2019-04-1016-119/+121
|\ \ | |/ |/| | | | | Prepare 11.10.0-rc5 release See merge request gitlab-org/gitlab-ce!27199
| * Merge branch 'revert-2cc01f12' into 'master'11-10-stable-prepare-rc5Rémy Coutable2019-04-104-89/+10
| | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'" Closes #60315 See merge request gitlab-org/gitlab-ce!27195 (cherry picked from commit 3b163a75b7789c92a001343ebccaac00b645eb8d) bcfd04a2 Revert "Merge branch 'sh-optimize-projects-api' into 'master'"
| * Merge branch 'docs/make-content-us-english' into 'master'Achilleas Pipinellis2019-04-102-6/+6
| | | | | | | | | | | | | | | | | | Use US English for content See merge request gitlab-org/gitlab-ce!27154 (cherry picked from commit 8511a43af77f2dd3b0e4e94d9dc8bf47fe4ffdd6) 42fe253c Use US English for content
| * Merge branch '60249' into 'master'Annabel Dunstone Gray2019-04-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | Fix SVG icon colors in Related MRs widget Closes #60249 See merge request gitlab-org/gitlab-ce!27151 (cherry picked from commit 5e2d16e8d83546d5ccc18b6566ec1adacac448c7) 5fe0fe77 Fix icon colors of related MRs widget
| * Merge branch '60162-fix-time-windows' into 'master'Douwe Maan2019-04-105-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve Environments#additional_metrics TypeError, ensure unix format Closes #60162 See merge request gitlab-org/gitlab-ce!27118 (cherry picked from commit 7a7808e3ccbfa7c4ea37e4d7ea4421f778027b17) 89dd5efe Remove unnecessary parameter transformation fedc5e4e Pass time params in seconds per unix spec c0e342c1 Add unit tests for js time window utils a0ac8c25 Fix static analysis and false positive test
| * Merge branch 'qa-quarantine-failing-staging-nightly-tests' into 'master'Ramya Authappan2019-04-101-1/+2
| | | | | | | | | | | | | | | | | | Quarantine failing tests See merge request gitlab-org/gitlab-ce!27036 (cherry picked from commit 88bf73a719933c136cc2bd9b791b6d5ca85cd330) fcc7b72b Quarantine failing tests
| * Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'Kamil Trzciński2019-04-103-9/+40
|/ | | | | | | | | Create pipelines for merge requests **only** when source branch is updated See merge request gitlab-org/gitlab-ce!26921 (cherry picked from commit 1fce09ed0dc775d706d61e37268b6f39c3fe3de6) e0efa97c Prevent triggering pipelines when target branch is updated
* Merge branch '11-10-stable-prepare-rc4' into '11-10-stable'John Jarvis2019-04-0912-144/+530
|\ | | | | | | | | Prepare 11.10.0-rc4 release See merge request gitlab-org/gitlab-ce!27157
| * Merge branch '60231-pipeline-regression-fix' into 'master'Mike Greiling2019-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | Override problematic display with utility class Closes #60231 See merge request gitlab-org/gitlab-ce!27138 (cherry picked from commit 746a6faa234a5240a8d93c425a9f57f1a323fd4b) 42f6a8c3 Override problematic display with utility class
| * Merge branch 'fix-pull-request-importer' into 'master'Kamil Trzciński2019-04-093-1/+79
| | | | | | | | | | | | | | | | | | Improve performance of PR import See merge request gitlab-org/gitlab-ce!27121 (cherry picked from commit f15caf0109998308e7f960baaa541d73be8bcacb) f3ad51f8 Improve performance of PR import
| * Merge branch '60123-graphql-complexity-limit-too-low-for-schema-load' into ↵Douglas Barbosa Alexandre2019-04-093-8/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GraphQL complexity limit too low for Schema load / IntrospectionQuery Closes #60123 See merge request gitlab-org/gitlab-ce!27063 (cherry picked from commit b28d6d8ab886016e37ca0d9d51df25ffe1b7d3b6) e86a2e7e Increase GraphQL complexity
| * Merge branch 'document-approach-for-handling-big-repositories' into 'master'Achilleas Pipinellis2019-04-092-0/+236
| | | | | | | | | | | | | | | | | | Add useful tips about big repositories See merge request gitlab-org/gitlab-ce!27005 (cherry picked from commit 34f68b3e35bbfa35cb831c16643eadb4dda70039) c93779ac Add usefull tips about big repositories
| * Merge branch 'revert-e4b2c3b0' into 'master'Stan Hu2019-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" Closes #60217 See merge request gitlab-org/gitlab-ce!26066 (cherry picked from commit 5cc1d2f1ef2fd64662e1a1f9b72dd59b0ec98625) 596d5fa2 Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'"
| * Merge branch 'review-revamp-issues-docs' into 'master'Mike Lewis2019-04-092-133/+98
|/ | | | | | | | | | | | | | | | | | | | | | | Refactor Issues doc Closes #56877 See merge request gitlab-org/gitlab-ce!24695 (cherry picked from commit b0854042923e9e8ad6b3f34b29631ffaa127d06e) 676db3d9 Rewrite of Issues index.md 472f55ac Fix bullet format 54b45216 Add tiers and minor edits 338f4960 Edits to intro 235cbce4 Fix HTML tag issue in table e6f0f140 Use absolute URLs for EE only features 3a8c741f Fix link to permissions.md a18803e6 Minor edits to issues_functionalities.md page 30c9c236 Add class to table 2966bc04 Updates per reviews eb3f980c Additional minor edits per reviews 8bbabc2b Split import and export issues to their own item 78130c91 Remove center css class from table
* Merge branch 'master' into 11-10-stableJohn Jarvis2019-04-08645-3584/+8976
|\
| * Merge branch '59570-wip-quick-action' into 'master'Sean McGivern2019-04-082-47/+44
| |\ | | | | | | | | | | | | | | | | | | Extract w-i-p quick action to a shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26923
| | * Extract wip quick action to a shared example59570-wip-quick-actionAlexandru Croitor2019-04-052-47/+44
| | |