summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable no-console ESLint rule for testswinh-lint-console-testsWinnie Hellmann2018-07-244-4/+4
|
* Merge branch 'docs/add-step-to-install-postgre-gems-mysql_to_postgresql' ↵Rémy Coutable2018-07-231-0/+6
|\ | | | | | | | | | | | | into 'master' Docs: Add a step to install Postgresql related Gems before creating the schema See merge request gitlab-org/gitlab-ce!20739
| * Update mysql_to_postgresql.mdMiao Wang2018-07-201-0/+6
| |
* | Merge branch 'patch-28' into 'master'Rémy Coutable2018-07-231-1/+1
|\ \ | | | | | | | | | | | | Minor typo fix CODE_QUALITY seems to have a `_` in it in .gitlab-ci.yml default… See merge request gitlab-org/gitlab-ce!20762
| * | Minor typo fix CODE_QUALITY seems to have a `_` in it in .gitlab-ci.yml ↵Tracey Jaquith2018-07-221-1/+1
| | | | | | | | | | | | default templates, and to wit, without `_` seems to have no effect
* | | Merge branch '49272-sanitize-git-url-in-import-errors' into 'master'Rémy Coutable2018-07-233-3/+8
|\ \ \ | | | | | | | | | | | | | | | | Resolve "Credentails used for repository import are visible inside the Sidekiq logs (Background Jobs)" See merge request gitlab-org/gitlab-ce!20641
| * | | Fix #49272 - Sanitize git URL in import errorsJamie Schembri2018-07-163-3/+8
| | | |
* | | | Merge branch 'da-feature-flags' into 'master'Rémy Coutable2018-07-232-8/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow feature flag names to be a symbol See merge request gitlab-org/gitlab-ce!20728
| * | | | Allow feature flag names to be a symbolda-feature-flagsDouglas Barbosa Alexandre2018-07-192-8/+26
| | | | |
* | | | | Merge branch '48627-document-which-api-is-accessible-with-ci_job_token-docs' ↵Achilleas Pipinellis2018-07-231-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Document which API is accessible with CI_JOB_TOKEN" Closes #48627 See merge request gitlab-org/gitlab-ce!20612
| * | | | | Document where CI_JOB_TOKEN is used48627-document-which-api-is-accessible-with-ci_job_token-docsSteve Azzopardi2018-07-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | closes #48627
* | | | | | Merge branch 'docs-unicorn-metrics' into 'master'Achilleas Pipinellis2018-07-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use title: "Unicorn Metrics available" as in EE See merge request gitlab-org/gitlab-ce!18620
| * | | | | | Use title: "Unicorn Metrics available" as in EEdocs-unicorn-metricsLin Jen-Shin2018-07-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'project-visibility-tooltip' into 'master'Rémy Coutable2018-07-233-3/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #47379 - Project visibility tooltip Closes #47379 See merge request gitlab-org/gitlab-ce!20535
| * | | | | | | Fix #47379 - Project visibility tooltipJamie Schembri2018-07-233-3/+30
|/ / / / / / /
* | | | | | | Merge branch '46869-deploy-tokens-failed-to-clone-lfs-repository' into 'master'Grzegorz Bizon2018-07-235-4/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deploy Tokens failed to clone LFS repository" Closes #46869 See merge request gitlab-org/gitlab-ce!20729
| * | | | | | | Resolve "Deploy Tokens failed to clone LFS repository"Mayra Cabrera2018-07-235-4/+73
|/ / / / / / /
* | | | | | | Merge branch 'gitaly-add-remote-mandatory' into 'master'Sean McGivern2018-07-231-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused rugged code that is currently on Gitaly See merge request gitlab-org/gitlab-ce!20754
| * | | | | | | Remove unused rugged code that is currently on GitalyAlejandro Rodríguez2018-07-201-8/+0
| | | | | | | |
* | | | | | | | Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-2315-0/+414
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hangouts chat integration See merge request gitlab-org/gitlab-ce!20290
| * | | | | | | | Fix some moments in documentationKukovskii Vladimir2018-07-222-2/+4
| | | | | | | | |
| * | | | | | | | Fix Hangouts Chat service spec shared exampleKukovskii Vladimir2018-07-181-8/+4
| | | | | | | | |
| * | | | | | | | Fix couple of moments in HangoutsChatService and its specKukovskii Vladimir2018-07-143-23/+29
| | | | | | | | |
| * | | | | | | | Rework spec for Hangouts Chat serviceKukovskii Vladimir2018-07-141-172/+107
| | | | | | | | |
| * | | | | | | | Fix fetch_attachment_title method of Hangouts Chat serviceKukovskii Vladimir2018-07-141-2/+1
| | | | | | | | |
| * | | | | | | | Add documentation for Hangouts Chat integrationKukovskii Vladimir2018-07-145-0/+79
| | | | | | | | |
| * | | | | | | | Add Hangouts Chat service implementationKukovskii Vladimir2018-07-145-0/+343
| | | | | | | | |
| * | | | | | | | Add dummy Google Hangouts Chat integrationKukovskii Vladimir2018-07-146-0/+54
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-theme-index' into 'master'Douwe Maan2018-07-231-8/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix theme index to match reality See merge request gitlab-org/gitlab-ce!20772
| * | | | | | | | | Fix theme index to match realityBalasankar "Balu" C2018-07-231-8/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-team-labels-manage-docs' into 'master'Douwe Maan2018-07-231-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING to include Manage team See merge request gitlab-org/gitlab-ce!20750
| * | | | | | | | | | Correct label sequenceAndreas Kämmerle2018-07-201-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Update CONTRIBUTING.mdAndreas Kämmerle2018-07-201-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fj-48123-fix-gitlab-import' into 'master'Douwe Maan2018-07-239-20/+135
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab import project load Closes #48123 See merge request gitlab-org/gitlab-ce!20599
| * | | | | | | | | | | Fix gitlab import project loadFrancisco Javier López2018-07-239-20/+135
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs-web_url-for-pipelines-and-jobs' into 'master'Douwe Maan2018-07-238-18/+50
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose web_url attribute in PipelineBasic and JobBasic See merge request gitlab-org/gitlab-ce!20703
| * | | | | | | | | | | Ensure a job preloads the project's namespace to avoid N+1Robert Speicher2018-07-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Ensure basic pipeline schema matches new definitionRobert Speicher2018-07-201-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Expose web_url attribute in PipelineBasic and JobBasicrs-web_url-for-pipelines-and-jobsRobert Speicher2018-07-186-15/+45
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-2312-38/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Disable SAML and Bitbucket if OmniAuth is disabled" Closes #48932 See merge request gitlab-org/gitlab-ce!20608
| * | | | | | | | | | | | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-2012-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also try to unify the way we setup OmniAuth, and how we check if it's enabled or not.
* | | | | | | | | | | | | Merge branch '49341-show-runner-overflow' into 'master'Phil Hughes2018-07-231-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin > Runners > Edit page overflows screen" Closes #49341 See merge request gitlab-org/gitlab-ce!20757
| * | | | | | | | | | | | | Add container to show runner pageAnnabel Dunstone Gray2018-07-201-1/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '46126-project-counters-space' into 'master'Phil Hughes2018-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Uneven spaces between project page counters" Closes #46126 See merge request gitlab-org/gitlab-ce!20753
| * | | | | | | | | | | | | Remove extra whitespace in star project buttonAnnabel Dunstone Gray2018-07-201-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'update-mr-img-docs' into 'master'48773-gitlab-project-import-should-use-object-storageMike Lewis2018-07-221-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge_request.png in docs See merge request gitlab-org/gitlab-ce!20730
| * | | | | | | | | | | | | Update merge_request.png in docsVictor Wu2018-07-221-0/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'milestones-update-docs' into 'master'Mike Lewis2018-07-223-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs milestones See merge request gitlab-org/gitlab-ce!20731
| * | | | | | | | | | | | Update docs milestonesVictor Wu2018-07-223-0/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch ↵Robert Speicher2018-07-208-39/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6104-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master' [CE] Resolve "Extract EE specific files/lines for some platform related project views" See merge request gitlab-org/gitlab-ce!19859