summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use render instead of render_if_exists in app/views/projects/services/prometh...6977-follow-up-from-ee-resolve-extract-ee-specific-files-lines-for-some-platform-related-project-viewsRémy Coutable2018-07-231-1/+1
* Merge branch '5491-backport-code' into 'master'Rémy Coutable2018-07-233-2/+5
|\
| * backport code from EE5491-backport-codeLukas Eipert2018-07-203-2/+5
* | Update CHANGELOG.md for 11.1.1GitLab Release Tools Bot2018-07-234-15/+12
* | Merge branch 'frozen-string-vestigial' into 'master'Rémy Coutable2018-07-235-0/+13
|\ \
| * | Enable frozen string in newly added filesgfyoung2018-07-215-0/+13
* | | Merge branch 'sh-remove-banzai-instrumentation' into 'master'Yorick Peterse2018-07-232-14/+5
|\ \ \
| * | | Remove method instrumentation for Banzai filters and reference parserssh-remove-banzai-instrumentationStan Hu2018-07-222-14/+5
* | | | Merge branch 'tz-mr-refactor-memory-reduction' into 'master'Fatih Acet2018-07-2311-94/+149
|\ \ \ \
| * | | | Reducing the memory footprint for the renderingTim Zallmann2018-07-2311-94/+149
|/ / / /
* | | | Merge branch 'docs/fix-rendering-issue-in-pages' into 'master'Rémy Coutable2018-07-231-1/+0
|\ \ \ \
| * | | | Fix rendering issue in admin/pages docsRobin Naundorf2018-07-221-1/+0
| |/ / /
* | | | Merge branch 'docs/add-step-to-install-postgre-gems-mysql_to_postgresql' into...Rémy Coutable2018-07-231-0/+6
|\ \ \ \
| * | | | 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 defau...Tracey Jaquith2018-07-221-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '49272-sanitize-git-url-in-import-errors' into 'master'Rémy Coutable2018-07-233-3/+8
|\ \ \ \ \
| * | | | | 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 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
|\ \ \ \ \ \
| * | | | | | Document where CI_JOB_TOKEN is used48627-document-which-api-is-accessible-with-ci_job_token-docsSteve Azzopardi2018-07-131-1/+3
* | | | | | | Merge branch 'docs-unicorn-metrics' into 'master'Achilleas Pipinellis2018-07-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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 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"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 GitalyAlejandro Rodríguez2018-07-201-8/+0
* | | | | | | | | Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-2315-0/+414
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 realityBalasankar "Balu" C2018-07-231-8/+8
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'update-team-labels-manage-docs' into 'master'Douwe Maan2018-07-231-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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