summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.5.0-rc13v11.5.0-rc13GitLab Release Tools Bot2018-11-201-1/+1
|
* Merge branch 'sh-fix-issue-8448-ce' into 'master'Steve Azzopardi2018-11-201-1/+8
| | | | | | | Stub Rails.application.env_config to prevent spec failures Closes gitlab-ee#8488 See merge request gitlab-org/gitlab-ce!23222
* Merge branch 'docs-runbook-guide' into 'master'Mike Lewis2018-11-209-3/+91
| | | | | add guide for creating runbook See merge request gitlab-org/gitlab-ce!22885
* Merge branch '11-5-stable-prepare-rc13' into '11-5-stable'11-5-stable-prepare-rc13Cindy Pallares 🦉2018-11-209-60/+30
|\ | | | | | | | | Prepare 11.5 RC13 release See merge request gitlab-org/gitlab-ce!23206
| * Merge branch 'jramsay/file-tree-docs' into 'master'Achilleas Pipinellis2018-11-192-3/+4
| | | | | | | | | | | | | | | | | | Update merge request file tree docs See merge request gitlab-org/gitlab-ce!23187 (cherry picked from commit fa1fadb4dc214ded1e8f167bf7ae418608e639a5) fff9aa64 Update merge request file tree docs
| * Merge branch 'image-discussion-ff-fix' into 'master'Filipa Lacerda2018-11-193-13/+10
| | | | | | | | | | | | | | | | | | | | | | Fixed image discussion styling Closes #54110 See merge request gitlab-org/gitlab-ce!23127 (cherry picked from commit ef1a158773c7cfbf681df6ed7f3514963ad8ca1b) 718c66f6 Fixed image discussion styling
| * Merge branch 'docs/clusters-knative' into 'master'Marcia Ramos2018-11-191-13/+11
| | | | | | | | | | | | | | | | | | Update the cluster docs for Knative See merge request gitlab-org/gitlab-ce!23113 (cherry picked from commit 17ef595865cde550e101806f69ead4b4394a79ae) 7b2fe02b Update the cluster docs for Knative
| * Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'Douwe Maan2018-11-192-28/+1
| | | | | | | | | | | | | | | | | | | | | | Remove 'comment_on_any_diff_line' feature flag Closes #54034 See merge request gitlab-org/gitlab-ce!23093 (cherry picked from commit b7cedd91e5ec07461b25f3920ae6cf2b00f3d84e) 6c796702 Remove 'comment_on_any_diff_line' feature flag
| * Merge branch 'libre-to-core' into 'master'Marcia Ramos2018-11-191-3/+4
|/ | | | | | | | | | | Documentation: update Libre -> Core See merge request gitlab-org/gitlab-ce!22533 (cherry picked from commit 633f59cb8e1d27ce13b532faac3b40141e002671) bd8021ae Update Libre -> Core be00c403 Add missing links d3ddd3fd Fix include intro note as per documentation guidelines
* Merge branch '11-5-stable-fix-changelog' into '11-5-stable'Stan Hu2018-11-191-0/+0
|\ | | | | | | | | Move changelog for issue 54189 to correct location See merge request gitlab-org/gitlab-ce!23216
| * Move changelog for issue 54189 to correct locationCindy Pallares2018-11-191-0/+0
|/
* Update VERSION to 11.5.0-rc12v11.5.0-rc12GitLab Release Tools Bot2018-11-181-1/+1
|
* Merge branch 'sh-fix-issue-54189-11-5' into 'security-11-5'Steve Azzopardi2018-11-184-1/+37
| | | | | [11.5] Prevent templated services from being imported See merge request gitlab/gitlabhq!2635
* Merge branch 'security-11-5-2717-xss-username-autocomplete' into 'security-11-5'Steve Azzopardi2018-11-183-10/+39
| | | | | [11.5] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2606
* Update VERSION to 11.5.0-rc11v11.5.0-rc11GitLab Release Tools Bot2018-11-161-1/+1
|
* Merge branch '11-5-stable-prepare-rc11' into '11-5-stable'Steve Azzopardi2018-11-1615-60/+370
|\ | | | | | | | | Prepare 11.5 RC11 release See merge request gitlab-org/gitlab-ce!23139
| * Merge branch ↵Steve Azzopardi2018-11-162-4/+12
| | | | | | | | | | | | | | | | | | '54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-files' into 'master' Resolve "All files named `index.*` have their content rendered as if they were text files" Closes #54011 See merge request gitlab-org/gitlab-ce!23063
| * Resolve conflict in doc/user/project/clusters/eks_and_gitlab/index.md11-5-stable-prepare-rc11Steve Azzopardi2018-11-161-22/+0
| | | | | | | | Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23139
| * Merge branch 'docs-eks-update' into 'master'Achilleas Pipinellis2018-11-163-32/+202
| | | | | | | | | | | | Docs eks update See merge request gitlab-org/gitlab-ce!23133
| * Merge branch 'docs/rs-revert-api-version' into 'master'Evan Read2018-11-162-2/+2
| | | | | | | | | | | | | | | | | | Revert API is going into 11.5, not 11.6. See merge request gitlab-org/gitlab-ce!23060 (cherry picked from commit 38d234e2e5474fc732306c2cfbbd274e1cc32fea) f1f03895 Revert API is going into 11.5, not 11.6.
| * Merge branch 'docs-knative-guide' into 'master'Mike Lewis2018-11-166-12/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs knative guide See merge request gitlab-org/gitlab-ce!22953 (cherry picked from commit 78df53dfb13f42b75fde803e5a02888d7695e906) 0cae4c5c Initial draft for serverless page 417bc01d add images and url retrieval section 385576df fix broken links ddda4f5b include ci-yml in body 9f400c08 trigger build for docs 37582015 correct dockerfile term and update port 94b9ec52 Replace deploy-stage.png with smaller and cropped 25a1209b minor edits d3fede24 minor edits
| * Merge branch 'osw-comment-on-any-diff-line-docs' into 'master'Evan Read2018-11-162-0/+9
|/ | | | | | | | | Add docs for commenting in any line of MR diff files See merge request gitlab-org/gitlab-ce!22878 (cherry picked from commit fad88129f4aacda44b011a2404b0a53049d6212d) 19a79483 Add docs for commenting in any line of MR diff files
* Update VERSION to 11.5.0-rc10v11.5.0-rc10GitLab Release Tools Bot2018-11-151-1/+1
|
* Merge branch '11-5-stable-prepare-rc10' into '11-5-stable'Steve Azzopardi2018-11-1512-11/+192
|\ | | | | | | | | Prepare 11.5 RC10 release See merge request gitlab-org/gitlab-ce!23116
| * Merge branch '53491-fix-again' into 'master'11-5-stable-prepare-rc10Sean McGivern2018-11-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | Don't care about order when getting awarded issues Closes #53491 See merge request gitlab-org/gitlab-ce!23101 (cherry picked from commit f3c44f640a0644590485d61d36ad222b343ec139) 8ae9b248 Don't care about order when getting awarded issues
| * Merge branch 'ignore-environment-validation-failure' into 'master'Kamil Trzciński2018-11-154-0/+78
| | | | | | | | | | | | | | | | | | | | | | Ignore environment validation failure See merge request gitlab-org/gitlab-ce!23100 (cherry picked from commit 0f25d2b33fbee7161f0ecf26a6d853533808beec) ea695ab7 Ignore environment validation failure a2a2a8f0 Add changelog 00842f95 User persisted?
| * Merge branch '53882-extra-container-diff-version' into 'master'Fatih Acet2018-11-151-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix version system note Closes #53882 See merge request gitlab-org/gitlab-ce!23030 (cherry picked from commit d645df8220669b7ccb889349d412bf527d621fc4) f25e6aa2 Fix version system note d0f8e279 Remove box on diff tab system note 0c4170b8 Add back margin on discussion system notes 5e66292d Tweak vertical line to line up with system notes and comment avatars
| * Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-152-3/+37
| | | | | | | | | | | | | | | | | | | | | | Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019 (cherry picked from commit 63b4b4b2688fa4f068772026536b2250bce39070) 8e265bc3 Fix collapsed files not fully fully expanding
| * Merge branch 'fix-deployment-metrics-in-mr-widget' into 'master'Kamil Trzciński2018-11-154-4/+50
|/ | | | | | | | | | | | | | | Avoid returning deployment metrics url to MR widget when the deployment is not successful Closes #53870 See merge request gitlab-org/gitlab-ce!23010 (cherry picked from commit 7674a8f477c90c1c8c9a969e7d80ea1ec9e72cd9) e270fcc8 Fix deployment metrics in MR widget 15431054 Add spec for deployment metrics 2d6570f0 Do not remove the existing permission check 09e693c6 Add changelog d8c24ac1 Remove unrelated changes
* Update VERSION to 11.5.0-rc9v11.5.0-rc9GitLab Release Tools Bot2018-11-151-1/+1
|
* Merge branch '11-5-stable-prepare-rc9' into '11-5-stable'Cindy Pallares 🦉2018-11-1535-100/+1409
|\ | | | | | | | | Prepare 11.5 RC9 release See merge request gitlab-org/gitlab-ce!23061
| * Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'11-5-stable-prepare-rc9Clement Ho2018-11-143-17/+54
| | | | | | | | | | | | | | Disable updating appearance of filter tokens for special values Closes #53636 See merge request gitlab-org/gitlab-ce!22865
| * Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-1421-60/+1264
| | | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * Merge branch 'docs/markup-languages' into 'master'Marcia Ramos2018-11-141-10/+24
| | | | | | | | | | Add a new markup languages section See merge request gitlab-org/gitlab-ce!22921
| * Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-142-4/+24
| | | | | | | | | | | | | | Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
| * Merge branch 'qa-fix-git-protocol-v2-spec' into 'master'Rémy Coutable2018-11-141-2/+2
| | | | | | | | | | | | | | Fix Git protocol v2 e2e test Closes gitlab-org/quality/staging#16 See merge request gitlab-org/gitlab-ce!23067
| * Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
| | | | | | | | | | | | | | Fix vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
| * Merge branch 'dark-theme-comments' into 'master'Fatih Acet2018-11-141-0/+4
| | | | | | | | | | Add white background to commit diff comments See merge request gitlab-org/gitlab-ce!23078
| * Merge branch 'dm-commit-email-select-options' into 'master'Stan Hu2018-11-143-3/+13
| | | | | | | | | | | | | | Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
| * Merge branch ↵Phil Hughes2018-11-142-2/+7
| | | | | | | | | | | | | | | | | | '54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted' into 'master' Resolve "Activity Feed - Missing padding in event note when a branch is deleted" Closes #54002 See merge request gitlab-org/gitlab-ce!23038
| * Merge branch 'add-documentation-for-git-operations-stack-trace' into 'master'Douwe Maan2018-11-141-0/+15
|/ | | | | | | | | | Adds documentation of git trace when git push/pull times out See merge request gitlab-org/gitlab-ce!23016 (cherry picked from commit 9d5d7c83e20b6f964f22cb7ada488997e08df105) 30bfef30 Adds documentation of git trace when git push/pull times out db6913cb Adds comma after "timings" in git troubleshooting documentation
* Update VERSION to 11.5.0-rc8v11.5.0-rc8GitLab Release Tools Bot2018-11-141-1/+1
|
* Merge branch '11-5-stable-prepare-rc8' into '11-5-stable'Steve Azzopardi2018-11-1427-111/+632
|\ | | | | | | | | Prepare 11.5 RC8 release See merge request gitlab-org/gitlab-ce!23032
| * Merge branch '53780-commit-discussion-ui' into 'master'11-5-stable-prepare-rc8Fatih Acet2018-11-135-22/+40
| | | | | | | | | | | | | | Fix broken UI on commit discussions Closes #53780 See merge request gitlab-org/gitlab-ce!22952
| * Merge branch 'upgrade-workhorse-7-1-0' into 'master'Nick Thomas2018-11-132-1/+6
| | | | | | | | | | Update GitLab-Workhorse to 7.1.0 See merge request gitlab-org/gitlab-ce!22883
| * Merge branch 'archive-builds-documentation' into 'master'Achilleas Pipinellis2018-11-132-5/+21
| | | | | | | | | | | | | | Add documentation for archive builds Closes #53534 See merge request gitlab-org/gitlab-ce!22909
| * Merge branch 'patch-31' into 'master'Stan Hu2018-11-131-1/+3
| | | | | | | | | | | | | | Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
| * Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-135-2/+199
| | | | | | | | | | | | | | Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
| * Merge branch 'dm-disable-codeowners' into 'master'Sean McGivern2018-11-131-0/+0
| | | | | | | | | | Disable CODEOWNERS for the time being See merge request gitlab-org/gitlab-ce!22991
| * Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-131-3/+3
| | | | | | | | | | Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
View Lorry Controller Status