summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.8.0-rc6v11.8.0-rc6GitLab Release Tools Bot2019-02-151-1/+1
|
* Merge branch '11-8-stable-prepare-rc6' into '11-8-stable'Robert Speicher2019-02-1511-9/+111
|\ | | | | | | | | Prepare 11.8.0-rc6 release See merge request gitlab-org/gitlab-ce!25279
| * Merge branch '56332-exclude-public-group-milestones-from-count' into 'master'Stan Hu2019-02-153-7/+11
| | | | | | | | | | | | | | | | | | | | | | Exclude public group milestones from counts in milestones dashboard Closes #56332 See merge request gitlab-org/gitlab-ce!25230 (cherry picked from commit bd488bc29afbfdfeca5c22ab2caa926525dd666b) 0f0bf2a2 Exclude public group milestones from counts
| * Merge branch 'sh-fix-board-user-assigns' into 'master'Douglas Barbosa Alexandre2019-02-154-1/+79
| | | | | | | | | | | | | | | | | | | | | | Fix 403 errors when adding an assignee list in project boards Closes gitlab-ee#9727 See merge request gitlab-org/gitlab-ce!25263 (cherry picked from commit a092b5ae45093dadc9a8834178a2c915e8bbead5) b2da8042 Fix 403 errors when adding an assignee list in project boards
| * Merge branch '57692-fix-rendering-of-none-any' into 'master'Phil Hughes2019-02-152-1/+12
| | | | | | | | | | | | | | | | | | | | | | Resolve "Search bar rendering `none` and `any` as users" Closes #57692 See merge request gitlab-org/gitlab-ce!25235 (cherry picked from commit 4b50e4d5edf6f89a4833b402d97edf45cdc9eac1) 65f534da Fix rendering of user token special values
| * Merge branch 'improve-error-tracking-docs' into 'master'Achilleas Pipinellis2019-02-152-0/+9
|/ | | | | | | | | | | | | | Update docs with permissions required for error tracking See merge request gitlab-org/gitlab-ce!25208 (cherry picked from commit 1e5c83f2c8756dbab16167063b68c30b8f3a1fd8) 4202f259 Update docs with permissions for error tracking df00f7c5 Add line to doc listing reqd Sentry token scopes 6d40af7c Apply suggestion to doc/user/project/operations/error_tracking.md 68d92af4 Apply suggestion to doc/user/project/operations/error_tracking.md 192e3ed4 Apply suggestion to doc/user/project/operations/error_tracking.md d7e03aff Add Manage Error Tracking permission to table
* Update VERSION to 11.8.0-rc5v11.8.0-rc5GitLab Release Tools Bot2019-02-141-1/+1
|
* Merge branch '11-8-stable-prepare-rc5' into '11-8-stable'Robert Speicher2019-02-1413-193/+284
|\ | | | | | | | | Prepare 11.8.0-rc5 release See merge request gitlab-org/gitlab-ce!25254
| * Merge branch 'sh-fix-content-disposition-inline' into 'master'Douglas Barbosa Alexandre2019-02-142-1/+18
| | | | | | | | | | | | | | | | | | | | | | Fix Content-Disposition hard-coded to attachments Closes #57660 See merge request gitlab-org/gitlab-ce!25214 (cherry picked from commit a77a1e1b4faaa1240e831b5da7903cd1d52e75a3) 134420f2 Fix Content-Disposition hard-coded to attachments
| * Merge branch ↵Robert Speicher2019-02-142-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | '57634-issue-when-viewing-a-document-with-footnotes-actionview-template-error-undefined-method-at_css-for-nil-nilclass' into 'master' Issue when viewing a document with footnotes Closes #57634 See merge request gitlab-org/gitlab-ce!25199 (cherry picked from commit 69c19b392e4636093050f576d3056a10371b01b2) f8241f25 Properly handle multiple refs to same footnote
| * Merge branch '57160-merge-request-tabs-header-is-missing-bottom-border' into ↵Annabel Dunstone Gray2019-02-142-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Merge Request Tabs Header is missing bottom border" Closes #57160 See merge request gitlab-org/gitlab-ce!25198 (cherry picked from commit 20226ed8e4231e4213db5644dab0fa576efbb8bc) 04853a4a Return border bottom on MR Tabs
| * Merge branch 'regression-commits-header-link' into 'master'Phil Hughes2019-02-142-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed link alignment See merge request gitlab-org/gitlab-ce!25162 (cherry picked from commit e865ee2b57ddcde51920a7b84189862dd4011b7e) 9189f14f Fixed link alignment bf1a7910 Fixed static analysis issue c0db4c7e Replaced class on caret b96f9011 Replaced flex with vertical-align-middle 665c1b96 Added mr-2 class back 91b97ae6 Fixed visual issue when MR has conflicts
| * Merge branch 'syntax-highlighting-again' into 'master'Phil Hughes2019-02-144-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix suggested changes syntax highlighting See merge request gitlab-org/gitlab-ce!25116 (cherry picked from commit d4b973fd515f70ead359510e553173bb2be8a802) adddcbd3 Fix suggested changes syntax highlighting 6d3626ef Add fix for suggested changes syntax highlighting b12a8b35 Move note-related classes into note_body 3f3eff4b Fix eslint issue 22839d1c Move class to before @apply
| * Merge branch 'qa-ml-quarantine-context' into 'master'Sanad Liaquat2019-02-142-173/+226
|/ | | | | | | | | | [QA] Skip contexts in quarantine See merge request gitlab-org/gitlab-ce!24942 (cherry picked from commit c6016ac8a8c12a736617e5250b63e0c930dda207) a2229074 Skip contexts in quarantine a3f93880 Refactor rspec config quarantine before blocks
* Update VERSION to 11.8.0-rc4v11.8.0-rc411-8-stable-prepare-rc4GitLab Release Tools Bot2019-02-131-1/+1
|
* Merge branch '11-8-stable-prepare-rc4' into '11-8-stable'Robert Speicher2019-02-135-5/+15
|\ | | | | | | | | Prepare 11.8.0-rc4 release See merge request gitlab-org/gitlab-ce!25206
| * Merge branch '57589-update-workhorse' into 'master'Stan Hu2019-02-132-1/+6
| | | | | | | | | | | | | | | | | | | | | | Update Workhorse to v8.3.1 Closes #57589 See merge request gitlab-org/gitlab-ce!25188 (cherry picked from commit bd17881bf592c0b8c662cc189c4e27bed8895f98) 7994d7c2 Update Workhorse to v8.3.1
| * Merge branch 'bump-gitaly-version-1.19.1' into 'master'Stan Hu2019-02-131-1/+1
| | | | | | | | | | | | | | | | | | Upgrade gitaly to 1.19.1 See merge request gitlab-org/gitlab-ce!25177 (cherry picked from commit bc881b8455c0059acfd8c1dc5dd3bf6c329ae53c) b0537f94 Fix regression bug in gitaly CommitStats RPC
| * Merge branch ↵Lin Jen-Shin2019-02-131-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | '57426-review-apps-some-merge-related-tests-fail-in-review-qa-jobs-but-not-in-package-and-qa' into 'master' Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineService Closes #57426 See merge request gitlab-org/gitlab-ce!25168 (cherry picked from commit d663c9269e4c2e14be071eb2bc8c2fee81160d86) 55e488d6 Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineService
| * Merge branch 'docs/pages-subgroup-admin' into 'master'Marcia Ramos2019-02-131-1/+1
|/ | | | | | | | | Fix pages admin documentation reference to subgroups See merge request gitlab-org/gitlab-ce!25163 (cherry picked from commit c0fa62b5d275508449ad97c8cecd8cd6bba1ef15) e6f06b3b Fix pages admin reference to subgroups
* Update VERSION to 11.8.0-rc3v11.8.0-rc3GitLab Release Tools Bot2019-02-121-1/+1
|
* Merge branch ↵Robert Speicher2019-02-122-7/+27
| | | | | | | | | '57604-checking-a-box-in-an-issue-description-consistently-throws-an-error-on-11-8-0-rc2' into 'master' Checking a box in an issue description consistently throws an error Closes #57604 See merge request gitlab-org/gitlab-ce!25174
* Merge branch '11-8-stable-prepare-rc3' into '11-8-stable'Robert Speicher2019-02-1253-15315/+141367
|\ | | | | | | | | Prepare 11.8.0-rc3 release See merge request gitlab-org/gitlab-ce!25167
| * Merge branch 'tz-fix-copy-as-gfm-firefox' into 'master'Phil Hughes2019-02-121-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | Transforming Gfm also on paste so it works also in FF Closes #57561 See merge request gitlab-org/gitlab-ce!25146 (cherry picked from commit 3dcdf16fbad67e64adc2db232bb11391586b3972) 10f496b5 Transforming Gfm also on paste so it works also in FF 8668cd52 Improved comments and added function to encapsulate logic
| * Merge branch '57551-collapse-board-list-fix' into 'master'Phil Hughes2019-02-122-1/+8
| | | | | | | | | | | | | | | | | | | | | | Add flex styles to board list only if board list is expanded Closes #57551 See merge request gitlab-org/gitlab-ce!25113 (cherry picked from commit 453dec0a575bce9db8df6003f3de62228bec1f53) df5882ee Add flex styles to board list only if board list is expanded
| * Merge branch 'bvl-port-translations-from-ee' into 'master'Rémy Coutable2019-02-1242-15302/+141195
| | | | | | | | | | | | | | | | | | Port of EE translations See merge request gitlab-org/gitlab-ce!25100 (cherry picked from commit a1215556ec6c5ab84862519b82cee99645dad357) 2d140e68 Merge branch 'master-i18n' into 'master'
| * Merge branch 'sh-import-source-branch-github-forks' into 'master'Yorick Peterse2019-02-125-5/+74
| | | | | | | | | | | | | | | | | | | | | | Create the source branch for a GitHub import Closes #57370 See merge request gitlab-org/gitlab-ce!25064 (cherry picked from commit 6dfce6e786f4828f3d2b0ff63d2a2dea4c82471c) e34a3213 Create the source branch for a GitHub import
| * Merge branch ↵Grzegorz Bizon2019-02-122-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | '7048_usage_ping_for_security_dashboard_as_default_view_for_groups-ce' into 'master' Usage ping for Group overview default user preference See merge request gitlab-org/gitlab-ce!24980 (cherry picked from commit d29e81b2aa7fc26736eb09309bbbf2ab5a5d5050) 60bd0a24 Add user_preferences_usage to usage ping fa518963 Protect group overview usage ping w/ feature flag
| * Merge branch ↵Evan Read2019-02-121-0/+43
|/ | | | | | | | | | | | | | | | | | | | | | | '57287-documentation-for-handling-more-complex-only-merge_requests-scenarios-is-sparse' into 'master' Docs for MR pipeline rule interactions Closes #57287 See merge request gitlab-org/gitlab-ce!24929 (cherry picked from commit ce91920819bdd8bc41e5c76ca1a67ef32486d1c8) 04e861af Add new section describing usage in exclusion scenario 82685510 Rename section header to be more clear cc0378c4 Apply suggestion to doc/ci/merge_request_pipelines/index.md 701e285e Apply suggestion to doc/ci/merge_request_pipelines/index.md 43b69682 Apply suggestion to doc/ci/merge_request_pipelines/index.md 9b2981fb Apply suggestion to doc/ci/merge_request_pipelines/index.md 42c9e397 Apply suggestion to doc/ci/merge_request_pipelines/index.md 98569488 Apply suggestion to doc/ci/merge_request_pipelines/index.md ba1b2ab9 Apply suggestion to doc/ci/merge_request_pipelines/index.md 71597f9b Apply suggestion to doc/ci/merge_request_pipelines/index.md 4a2a9591 Small grammar fix
* Update VERSION to 11.8.0-rc2v11.8.0-rc2GitLab Release Tools Bot2019-02-111-1/+1
|
* Merge branch '11-8-stable-prepare-rc2' into '11-8-stable'Yorick Peterse2019-02-1111-31/+112
|\ | | | | | | | | Prepare 11.8.0-rc2 release See merge request gitlab-org/gitlab-ce!25095
| * Merge branch 'removes-milestone-from-cluster-base-domain-docs' into 'master'Evan Read2019-02-111-4/+3
| | | | | | | | | | | | | | | | | | Removes milestone from cluster base domain documentation See merge request gitlab-org/gitlab-ce!25045 (cherry picked from commit 84c9b1e7b9eea503b9193e36fdb457613376a635) 13a64a5c Removes milestone from cluster base domain
| * Merge branch 'mr-web-worker-origin' into 'master'Filipa Lacerda2019-02-113-10/+14
| | | | | | | | | | | | | | | | | | Fixes diff web worker not loading in staging See merge request gitlab-org/gitlab-ce!25039 (cherry picked from commit 171d919c19693c12e36dc6485c40a8abaf594e88) 37b860d7 Fixes diff web worker not loading in staging
| * Merge branch 'qa-staging-32-fix-create-project-spec' into 'master'Ramya Authappan2019-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix create_project_spec Closes gitlab-org/quality/staging#32 See merge request gitlab-org/gitlab-ce!25029 (cherry picked from commit a14be36a0d288c978d57bb0df22affeb548e8f11) 8ab5b3eb Use search_and_select instead of select_item
| * Merge branch ↵Phil Hughes2019-02-112-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57428-actionview-template-error-undefined-method-for-nil-nilclass' into 'master' Resolve "ActionView::Template::Error: undefined method `>' for nil:NilClass" Closes #57428 See merge request gitlab-org/gitlab-ce!25028 (cherry picked from commit 5b23f2b016f4e5d33387d7474148d2a59b213ee6) b177d523 Checking MR status date for related MR status tooltip 81b875f0 Added tests for merge_request_status partial 20ce370f Improved readability of issues related MR status spec
| * Merge branch 'diff-fuzzy-file-finder-feature-flag' into 'master'Filipa Lacerda2019-02-113-13/+64
| | | | | | | | | | | | | | | | | | | | | | Adds a feature flag to the diff fuzzy file finder Closes #57403 See merge request gitlab-org/gitlab-ce!25006 (cherry picked from commit fe572c0e49e8c5add7c055d3df22e3df032c11d5) f03a6574 Adds a feature flag to the diff fuzzy file finder
| * Merge branch 'docs/container-registry-api-introduced' into 'master'Marcia Ramos2019-02-111-1/+3
|/ | | | | | | | | | Mention when the Registry API was introduced See merge request gitlab-org/gitlab-ce!24596 (cherry picked from commit c220bee5ca1a025321df01a5c95310d397edbcc5) 597f4fea Add which GitLab version the Registry API docs were introduced 928fc142 Fix wrong Registry API description
* Merge master to 11.8 stable for the feature freezeYorick Peterse2019-02-08321-1524/+5107
|\
| * Merge branch 'patch-44' into 'master'Marcia Ramos2019-02-081-1/+1
| |\ | | | | | | | | | | | | docs: trivial: remove stray extra "to" See merge request gitlab-org/gitlab-ce!25024
| | * docs: remove stray extra "to"Andrew Petro2019-02-071-1/+1
| | |
| * | Merge branch 'move-permission-check-manual-actions-on-deployments' into 'master'Filipa Lacerda2019-02-0817-50/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Move permission check of manual actions of deployments Closes #52412 See merge request gitlab-org/gitlab-ce!24660
| | * | Move permission check of manual actions of deploymentsShinya Maeda2019-02-0817-50/+48
| |/ /
| * | Merge branch 'docs/fix-spelling-in-internationalisation-section' into 'master'Achilleas Pipinellis2019-02-083-5/+5
| |\ \ | | | | | | | | | | | | | | | | Fix spelling and other minor improvements See merge request gitlab-org/gitlab-ce!24813
| | * | Fix spelling and other minor improvementsdocs/fix-spelling-in-internationalisation-sectionEvan Read2019-01-313-5/+5
| | | |
| * | | Merge branch 'patch-40' into 'master'Achilleas Pipinellis2019-02-081-25/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update index.md See merge request gitlab-org/gitlab-ce!24698
| | * | | Update index.mdRajakavitha Kodhandapani2019-02-081-25/+19
| |/ / /
| * | | Merge branch 'docs/fix-anchor-landing-page' into 'master'Achilleas Pipinellis2019-02-081-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Anchor link was incorrect See merge request gitlab-org/gitlab-ce!24922
| | * | | Anchor link was incorrectdocs/fix-anchor-landing-pageEvan Read2019-02-051-1/+1
| | | | |
| * | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2019-02-081-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docs: capitalization fixes in Gitaly docs See merge request gitlab-org/gitlab-ce!24994
| | * | | | docs: capitalization fixes in GitalyBen Bodenmiller2019-02-071-9/+9
| | | | | |