summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'docs/edit-after-script-context' into 'master'Achilleas Pipinellis2019-06-162-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit after script context text See merge request gitlab-org/gitlab-ce!29583
| * | | | | | | | | | | | Edit after script context textEvan Read2019-06-162-14/+20
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'say-dependency-list-is-from-gemnasium-docs' into 'master'Achilleas Pipinellis2019-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say that the dependency list is from Gemnasium See merge request gitlab-org/gitlab-ce!29673
| * | | | | | | | | | | | Say that the dependency list is from GemnasiumFabien Catteau2019-06-161-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it explicit that the dependency list is generated from Gemnasium.
* | | | | | | | | | | | Merge branch 'patch-71' into 'master'Stan Hu2019-06-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken hyperlink in reducing_the_repo_size_using_git.md See merge request gitlab-org/gitlab-ce!29727
| * | | | | | | | | | | Fix broken hyperlink in reducing_the_repo_size_using_git.mdTom Forbes2019-06-151-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'pendo-poc' into 'master'Tim Zallmann2019-06-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Pendo POC snippet See merge request gitlab-org/gitlab-ce!29439
| * | | | | | | | | | | Backport: Pendo POC snippetDonald Cook2019-06-151-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'renovate/gitlab-ui-4.x' into 'master'Clement Ho2019-06-152-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^4.1.0 See merge request gitlab-org/gitlab-ce!29707
| * | | | | | | | | | Update dependency @gitlab/ui to ^4.1.0null2019-06-142-5/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵Fatih Acet2019-06-143-23/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge request tabs do not handle ctrl+click correctly" Closes #57813 See merge request gitlab-org/gitlab-ce!29506
| * | | | | | | | | | Allow command and control click to work on MR tabs57813-merge-request-tabs-do-not-handle-ctrl-click-correctlySam Bigelow2019-06-123-23/+38
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicorn' ↵Stan Hu2019-06-142-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' [CI Review Apps] Change `pullPolicy` to `Always` for `gitlab.sidekiq.image` and `gitlab.unicorn.image` and pass `FORCE_RAILS_IMAGE_BUILDS=true` to the `CNG-mirror` triggered pipeline to always rebuild the Rails image Closes #62149 See merge request gitlab-org/gitlab-ce!28592
| * | | | | | | | | Apply suggestion to scripts/review_apps/review-apps.sh62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicornRémy Coutable2019-06-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Pass FORCE_RAILS_IMAGE_BUILDS=true to the CNG triggered pipelineRémy Coutable2019-06-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | [Review Apps] Set `global.imagePullPolicy: Always`Rémy Coutable2019-06-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'ac-fix-graphql-project-stats' into 'master'Stan Hu2019-06-145-3/+93
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes graphql project stats Closes #63275 See merge request gitlab-org/gitlab-ce!29708
| * | | | | | | | | Do not blindly expose public project statisticsMayra Cabrera2019-06-145-3/+93
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the missing check on GraphQL API for project statistics
* | | | | | | | | Merge branch 'bvl-comments-graphql' into 'master'Jan Provaznik2019-06-1427-12/+469
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose comments on Noteables in GraphQL Closes #62825 See merge request gitlab-org/gitlab-ce!29212
| * | | | | | | | | Expose comments on Noteables in GraphQLBob Van Landuyt2019-06-1427-12/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes `Note`s on Issues & MergeRequests using a `Types::Notes::NoteableType` in GraphQL. Exposing notes on a new type can be done by implementing the `NoteableType` interface on the type. The presented object should be a `Noteable`.
* | | | | | | | | | Merge branch 'leipert-default-image-node-12' into 'master'Mike Greiling2019-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update default CI image to use node@12 See merge request gitlab-org/gitlab-ce!29703
| * | | | | | | | | | Update default CI image to use node@12Lukas 'Eipi' Eipert2019-06-141-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '12173-renumber-user-callout-enum' into 'master'Kamil Trzciński2019-06-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renumber a new UserCallout enum for EE compatibility Closes gitlab-ee#12173 See merge request gitlab-org/gitlab-ce!29701
| * | | | | | | | | | | Renumber a new UserCallout enum for EE compatibility12173-renumber-user-callout-enumNick Thomas2019-06-141-1/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Mike Greiling2019-06-142-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.65.0 See merge request gitlab-org/gitlab-ce!29697
| * | | | | | | | | | | Update dependency @gitlab/svgs to ^1.65.0Lukas 'Eipi' Eipert2019-06-142-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '4354-lock-memberships-to-ldap-sync-part-1' into 'master'Stan Hu2019-06-143-0/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE migration port: add app-wide LDAP membership lock field See merge request gitlab-org/gitlab-ce!29302
| * | | | | | | | | | | EE port: add app-wide LDAP membership lock field4354-lock-memberships-to-ldap-sync-part-1Pavel Shutsin2019-06-133-0/+30
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ee-12033-doc-lm-python-version-docs' into 'master'Achilleas Pipinellis2019-06-141-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document CI variable LM_PYTHON_VERSION See merge request gitlab-org/gitlab-ce!29667
| * | | | | | | | | | | Document CI variable LM_PYTHON_VERSIONFabien Catteau2019-06-141-0/+17
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show how one can switch to Python 3.5.
* | | | | | | | | | | Merge branch 'caneldem-master-patch-02411' into 'master'Achilleas Pipinellis2019-06-141-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add which tools is used by License Management project See merge request gitlab-org/gitlab-ce!29610
| * | | | | | | | | | | Add which tools is used by License Management projectCan Eldem2019-06-141-8/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/link-to-default-helm-chart' into 'master'Achilleas Pipinellis2019-06-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to default Helm chart See merge request gitlab-org/gitlab-ce!29652
| * | | | | | | | | | | Add link to default Helm chartEvan Read2019-06-141-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/admin-area-doc-structure' into 'master'Achilleas Pipinellis2019-06-141-30/+34
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add structure to admin area page See merge request gitlab-org/gitlab-ce!29105
| * | | | | | | | | | | Add structure to admin area pageEvan Read2019-06-141-30/+34
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also slight edit and spelling correction
* | | | | | | | | | | Merge branch 'renovate/gitlab-eslint-plugin-i18n-1.x' into 'master'Mike Greiling2019-06-142-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/eslint-plugin-i18n to ^1.1.0 See merge request gitlab-org/gitlab-ce!29630
| * | | | | | | | | | | Update dependency @gitlab/eslint-plugin-i18n to ^1.1.0renovate/gitlab-eslint-plugin-i18n-1.xLukas 'Eipi' Eipert2019-06-132-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs/cross-link-mr-approve' into 'master'Achilleas Pipinellis2019-06-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross link to MR approvals docs See merge request gitlab-org/gitlab-ce!29636
| * | | | | | | | | | | | Cross link to MR approvals docsEvan Read2019-06-141-1/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'leipert-node-12' into 'master'Mike Greiling2019-06-145-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to node@12 See merge request gitlab-org/gitlab-ce!29659
| * | | | | | | | | | | | Update to node@12leipert-node-12Lukas Eipert2019-06-145-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates our build images to use node@12. We are also adding a sentence to the from-source installation that while we require a minimum version of node@8, we also recommend node@12. Last but not least, we change the version of node in the .nvmrc so that developers using nvm can automatically use node@12 with the project
* | | | | | | | | | | | | Merge branch 'add-mikelewis-as-doc-codeowner' into 'master'Stan Hu2019-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CODEOWNERS to add mikelewis for doc path See merge request gitlab-org/gitlab-ce!29565
| * | | | | | | | | | | | | Update CODEOWNERS to add mikelewis for doc pathadd-mikelewis-as-doc-codeownerMike Lewis2019-06-121-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '62966-embed-zoom-call-in-issue-mvc' into 'master'Kushal Pandya2019-06-149-5/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Embed Zoom Call in Issue MVC" Closes #62966 See merge request gitlab-org/gitlab-ce!29454
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2019-06-1577-12316/+126491
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62966-embed-zoom-call-in-issue-mvc
| * | | | | | | | | | | | | | | Add Join meeting button to Issues with Zoom links62966-embed-zoom-call-in-issue-mvcSimon Knox2019-06-149-5/+173
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect links containing zoom.us followed by j, s, or my Add link below Issue title that links to Zoom meeting
* | | | | | | | | | | | | | | Merge branch 'specify-dashboard-name' into 'master'Mayra Cabrera2019-06-145-3/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify a dropdown name for dashboards See merge request gitlab-org/gitlab-ce!29343
| * | | | | | | | | | | | | | Specify a dropdown name for dashboardsSarah Yasonik2019-06-145-3/+55
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'diff-suggestions-popover' into 'master'Filipa Lacerda2019-06-1425-79/+269
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added diff suggestion popover Closes #56523 See merge request gitlab-org/gitlab-ce!29473
View Lorry Controller Status