summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove no longer valid passwordmj/remove-old-passwordMarin Jankovski2019-06-171-3/+0
|
* Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-1725-150/+54
|\ | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
| * Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-1425-150/+54
| | | | | | This reverts merge request !26853
* | Merge branch '62910-task-completion-status-gql-pderichs' into 'master'Sean McGivern2019-06-176-1/+81
|\ \ | | | | | | | | | | | | | | | | | | Make task completion status available via GraphQL Closes #62910 See merge request gitlab-org/gitlab-ce!29573
| * | Add task count and completed count to graphql types62910-task-completion-status-gql-pderichsPatrick Derichs2019-06-156-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for task completion status (graphql) Fix style issues Changed format of constants in spec Refactor specs to reduce creation of records Reduce parameters to merge request creation Use set's for project and user Move let's out of it_behaves_like block Fix description parameter Fix format of lets Use dig to get task completion status out of graphql response Modified rspec output Add changelog entry
* | | Merge branch 'sh-clean-query-recorder-backtrace' into 'master'Sean McGivern2019-06-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Clean QueryRecorder backtrace See merge request gitlab-org/gitlab-ce!29724
| * | | Clean QueryRecorder backtracesh-clean-query-recorder-backtraceStan Hu2019-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | This makes it much easier to debug N+1 queries via QueryRecorder by eliminating unnecessary lines.
* | | | Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'Kushal Pandya2019-06-171-3/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make changes suggested by Pedro for UX See merge request gitlab-org/gitlab-ce!29324
| * | | | Apply improved styling based on UX feedbackgitlab-ui-259-style-checkboxesSam Bigelow2019-06-121-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only apply extra margins and borders between checkbox components - Change cursor to `not-allowed` when checkbox is disabled - Adjust handling of inline checkbox styling vs block
* | | | | Merge branch 'docs-existing-knative' into 'master'Evan Read2019-06-171-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on using serverless with existing Knative instance See merge request gitlab-org/gitlab-ce!29699
| * | | | | Add documentation on using serverless with existing Knative instanceDaniel Gruesso2019-06-171-0/+9
|/ / / / /
* | | | | Merge branch 'sh-bump-ruby-labkit' into 'master'Ash McKenzie2019-06-172-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-labkit to 0.3.0 See merge request gitlab-org/gitlab-ce!29728
| * | | | | Upgrade gitlab-labkit to 0.3.0Stan Hu2019-06-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the version used in Gitaly, bumps the gRPC version to be aligned with GitLab CE/EE, and adds gRPC interceptor support: https://gitlab.com/gitlab-org/labkit-ruby/compare/v0.2.0...v0.3.0
* | | | | | Merge branch 'docs-university-link' into 'master'Evan Read2019-06-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix link in university support doc See merge request gitlab-org/gitlab-ce!29582
| * | | | | | Docs: Fix link in university support docMarcel Amirault2019-06-171-1/+1
|/ / / / / /
* | | | | | Merge branch 'docs-sso-enforce-note' into 'master'Evan Read2019-06-171-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: SSO Groups: Add login session note See merge request gitlab-org/gitlab-ce!29628
| * | | | | | Add login session notedocs-sso-enforce-noteCynthia Ng2019-06-131-0/+2
| | | | | | |
* | | | | | | Merge branch 'sh-bump-mime-types-data' into 'master'Ash McKenzie2019-06-172-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade mime-types-data to 3.2019.0331 See merge request gitlab-org/gitlab-ce!29729
| * | | | | | | Fix send_file_upload_spec.rb with right MIME typeStan Hu2019-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression in mime-types-data: https://github.com/mime-types/mime-types-data/pull/20
| * | | | | | | Upgrade mime-types-data to 3.2019.0331sh-bump-mime-types-dataStan Hu2019-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves some disk space by matching the version used in Gitaly. Only minor changes: https://github.com/mime-types/mime-types-data/blob/master/History.md
* | | | | | | | Merge branch 'fix/grammar' into 'master'Ray Paik2019-06-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | [Docs] Fix minor grammar issue See merge request gitlab-org/gitlab-ce!29716
| * | | | | | | Fix minor grammar issueArun Kumar Mohan2019-06-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'sh-bump-msgpack' into 'master'Ash McKenzie2019-06-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump msgpack to 1.2.10 See merge request gitlab-org/gitlab-ce!29730
| * | | | | | | | Bump msgpack to 1.2.10sh-bump-msgpackStan Hu2019-06-151-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves some space by matching the version used by Gitaly. List of changes: * https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog * https://github.com/msgpack/msgpack-ruby/compare/v1.2.6..v1.2.10
* | | | | | | | 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
| |/ / / / / / /