summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable frozen string in app/serializers/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-serializersgfyoung2018-07-23100-8/+216
| | | | Partially addresses #47424.
* Merge branch 'sh-remove-rouge-redcarpet-instrumentation' into 'master'Lin Jen-Shin2018-07-231-2/+0
|\ | | | | | | | | Remove instrumentation for Rouge::Plugins::{Redcarpet,CommonMark} See merge request gitlab-org/gitlab-ce!20791
| * Remove instrumentation Rouge::Plugins::{Redcarpet,CommonMark}Stan Hu2018-07-231-2/+0
| | | | | | | | | | The removal in 4d376c667d72e0eca22b4abe76e0bf09434fc4bd had an unintended side effect in that it got rid of the `require 'rouge/plugins/redcarpet'`.
* | Merge branch 'sh-enable-frozen-literals-banzi-filters' into 'master'Rémy Coutable2018-07-235-3/+28
|\ \ | | | | | | | | | | | | Enable frozen strings in remaining lib/banzai/filter/*.rb files See merge request gitlab-org/gitlab-ce!20777
| * | Enable frozen strings in remaining lib/banzai/filter/*.rb filessh-enable-frozen-literals-banzi-filtersStan Hu2018-07-235-3/+28
| | | | | | | | | | | | | | | | | | | | | This also fixes a bug with the ImageLazyLoadFilter not doing the right thing when an existing class attribute is present. Part of #47424
* | | Merge branch '45318-vuex-store' into 'master'Phil Hughes2018-07-238-0/+375
|\ \ \ | |_|/ |/| | | | | | | | Adds Vuex store to handle the data for tests reports in MR widget See merge request gitlab-org/gitlab-ce!20709
| * | Adds Vuex store to handle the data for tests reports in MR widgetFilipa Lacerda - 🌴🌴OOO back on July 30th🌴🌴2018-07-238-0/+375
|/ /
* | Merge branch 'docs-mention-how-it-is-used-in-gitlab-ce' into 'master'Rémy Coutable2018-07-231-0/+6
|\ \ | | | | | | | | | | | | Mention how we use gitlab-triage See merge request gitlab-org/gitlab-ce!20787
| * | Mention how we use gitlab-triageLin Jen-Shin2018-07-241-0/+6
|/ /
* | Merge branch 'blackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs' ↵Rémy Coutable2018-07-2322-39/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs' Closes #22991 See merge request gitlab-org/gitlab-ce!20768
| * | Fix seedsblackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobsblackst0ne2018-07-235-5/+5
| | |
| * | Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'blackst0ne2018-07-2327-44/+49
| |/ | | | | | | | | | | | | | | | | | | `perform_enqueued_jobs` is a Sidekiq method. Using this method violates the Dependency inversion principle[0]. This commit replaces `perform_enqueued_jobs` with ActiveJob's abstract method `perform_enqueued_jobs` in specs. [0]: https://en.wikipedia.org/wiki/Dependency_inversion_principle
* | Merge branch 'sh-freeze-banzai-filter-strings' into 'master'Rémy Coutable2018-07-2339-0/+81
|\ \ | | | | | | | | | | | | Enable frozen strings in lib/banzai/filter/*.rb See merge request gitlab-org/gitlab-ce!20775
| * | Enable frozen strings in lib/banzai/filter/*.rbsh-freeze-banzai-filter-stringsStan Hu2018-07-2339-0/+81
| |/ | | | | | | | | | | | | | | | | | | Excludes a few filters that require more work: * lib/banzai/filter/image_lazy_load_filter_spec.rb * lib/banzai/filter/syntax_highlight_filter_spec.rb * lib/banzai/filter/table_of_contents_filter_spec.rb Part of #47424
* | Merge branch '29278-commits-page-tooltips' into 'master'Annabel Gray2018-07-236-9/+12
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Commits page tooltips" Closes #29278 See merge request gitlab-org/gitlab-ce!20674
| * | fix user_browses_commits_spec29278-commits-page-tooltipsLuke Bennett2018-07-201-1/+0
| | |
| * | Add has_tooltip false to remaining commit realted usesLuke Bennett2018-07-202-2/+2
| | |
| * | Remove unneeded has_tooltip from commit_author_link useLuke Bennett2018-07-201-1/+1
| | |
| * | Remove all tooltip use from commit_person_linkLuke Bennett2018-07-201-5/+0
| | |
| * | Keep img title attrLuke Bennett2018-07-201-2/+2
| | |
| * | fix lintLuke Bennett2018-07-201-1/+2
| | |
| * | Added changelog entryLuke Bennett2018-07-171-0/+5
| | |
| * | Add has_tooltip bool handling for commit_person_linkLuke Bennett2018-07-171-5/+8
| | |
| * | Dont add title attr to user_avatar_without_link if has_tooltip is falseLuke Bennett2018-07-171-2/+2
| | |
| * | set has_tooltip to false for commit author_avatarLuke Bennett2018-07-171-2/+2
| | |
* | | Merge branch 'winh-tree-view-gpg' into 'master'Phil Hughes2018-07-2319-134/+213
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display GPG status on repository and blob pages Closes #36046 See merge request gitlab-org/gitlab-ce!20524
| * | | Display GPG status on repository and blob pagesWinnie Hellmann2018-07-2319-134/+213
|/ / /
* | | Merge branch '5491-backport-code' into 'master'Rémy Coutable2018-07-233-2/+5
|\ \ \ | | | | | | | | | | | | | | | | Pipeline security dashboard: Backport code from EE See merge request gitlab-org/gitlab-ce!20733
| * | | 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
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'frozen-string-vestigial' into 'master'Rémy Coutable2018-07-235-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable frozen string in newly added files See merge request gitlab-org/gitlab-ce!20763
| * | | | Enable frozen string in newly added filesgfyoung2018-07-215-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for new files in directories that had been previously covered in previous MR's. Partially addresses #47424.
* | | | | Merge branch 'sh-remove-banzai-instrumentation' into 'master'Yorick Peterse2018-07-232-14/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove method instrumentation for Banzai filters and reference parsers See merge request gitlab-org/gitlab-ce!20770
| * | | | | Remove method instrumentation for Banzai filters and reference parserssh-remove-banzai-instrumentationStan Hu2018-07-222-14/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For one README.md file, this instrumentation was adding several seconds and significant RAM and CPU overhead since these filters often iterate through all HTML nodes in tight loops. Relates to #49409
* | | | | Merge branch 'tz-mr-refactor-memory-reduction' into 'master'Fatih Acet2018-07-2311-94/+149
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reducing the memory footprint for the rendering See merge request gitlab-org/gitlab-ce!20744
| * | | | | 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 docs See merge request gitlab-org/gitlab-ce!20766
| * | | | | Fix rendering issue in admin/pages docsRobin Naundorf2018-07-221-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | * Remove whitespace to fix rendering of verbose logging -feature-docs in gitlab-pages docs.
* | | | | 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
| | | | | | | | |
View Lorry Controller Status