Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-23Merge branch 'winh-cleanup-comment-submit-test' into 'master'Clement Ho
Cleanup test for disabling comment submit button See merge request gitlab-org/gitlab-ce!17930
2018-03-23Merge branch ↵Stan Hu
'44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master' Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error" Closes #44564 See merge request gitlab-org/gitlab-ce!17962
2018-03-23Merge branch ↵Filipa Lacerda
'44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master' Resolve "Add internationalization support for the Prometheus Merge Request widget" Closes #44218 See merge request gitlab-org/gitlab-ce!17753
2018-03-23Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't always call `lines`, which meant that we didn't get the benefit of the side-effect from that, where it forced the conflict data itself to UTF-8. To fix that, make this explicit by separating the `raw_content` (any encoding) from the `content` (which is either UTF-8, or an exception is raised).
2018-03-23Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into ↵Filipa Lacerda
'master' Resolve "Problem with prettier setting trailingComma: all" Closes #44589 See merge request gitlab-org/gitlab-ce!17967
2018-03-23ensure stylesheets are included as well, make prettierrc even more inclusiveMike Greiling
2018-03-23make babel-transpiled overrides more inclusive and reduce conflicts with EEMike Greiling
2018-03-23Add i18n support for the mrWidget prometheus memory widgetJose Ivan Vargas
2018-03-23Merge branch 'docs/gitlab-com-settings' into 'master'Marcia Ramos
Move GitLab.com settings under main docs See merge request gitlab-org/gitlab-ce!17968
2018-03-23Merge branch 'gitlab-shell-7.1.1' into 'master'Douwe Maan
Use gitlab-shell 7.1.1 See merge request gitlab-org/gitlab-ce!17959
2018-03-23update eslintignore for node scriptsMike Greiling
2018-03-23prettify all node scriptsMike Greiling
2018-03-23Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher
Fix EncodingHelper#clean blowing up on UTF-16BE strings Closes gitaly#1101 See merge request gitlab-org/gitlab-ce!17943
2018-03-23Move GitLab.com settings under main docsAchilleas Pipinellis
2018-03-23ignore generated locale files with prettierMike Greiling
2018-03-23update prettier config to differentiate node scripts from babel compiled modulesMike Greiling
2018-03-23Merge branch 'sh-improve-rollback-test' into 'master'Robert Speicher
Rollback to a set version instead of an arbitrary number of steps Closes #40302 See merge request gitlab-org/gitlab-ce!17947
2018-03-23Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into ↵Robert Speicher
'master' Resolve "Autolinking includes trailing exclamation marks" Closes #44587 See merge request gitlab-org/gitlab-ce!17965
2018-03-23Fix a spec that will break in EENick Thomas
2018-03-23Merge branch 'performance-bar-vue-resource' into 'master'Filipa Lacerda
Add Vue resource interceptor to performance bar See merge request gitlab-org/gitlab-ce!17915
2018-03-23Add ?, !, and : to trailing puncutation excluded from auto-linkingSean McGivern
2018-03-23Merge branch 'pages_force_https' into 'master'Nick Thomas
HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273
2018-03-23Merge branch 'sh-update-loofah' into 'master'Robert Speicher
Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4 Closes #44554 See merge request gitlab-org/gitlab-ce!17945
2018-03-23Merge branch 'patch-28' into 'master'Sean McGivern
Update the menu information to access "Schedules" page See merge request gitlab-org/gitlab-ce!17957
2018-03-23Remove outdates TODOs from pipeline classGrzegorz Bizon
2018-03-23Remove N+1 query for Noteable association.Andreas Brandl
For each event with `Event#target_type` of "Note", we had a query to load the associated instance `noteable`. For example, if `Note` was related to an issue, we'd load each `Issue` with its own query (N+1 problem). Closes #43150.
2018-03-23Merge branch 'tz-prettier-print-width-100' into 'master'Clement Ho
Update Prettier Print Width to 100 See merge request gitlab-org/gitlab-ce!17953
2018-03-23Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master'Douwe Maan
Resolve "Limit number of failed logins using LDAP for authentication" Closes #43525 See merge request gitlab-org/gitlab-ce!17886
2018-03-23Merge branch 'patch-1' into 'master'Sean McGivern
Request Chinese Traditional proofreader permissions. See merge request gitlab-org/gitlab-ce!17762
2018-03-23Use gitlab-shell 7.1.1Jacob Vosmaer
2018-03-23Update the menu information to access "Schedules" pageBertrand Jamin
2018-03-23Merge branch 'storage-dropdown' into 'master'Sean McGivern
Show gitaly address instead of disk path See merge request gitlab-org/gitlab-ce!17954
2018-03-23Disable cursor for review mode in the IDEPhil Hughes
Also disables occurrences highlights & the line highlight for the review mode. Closes #44307
2018-03-23Merge branch 'jprovazn-issueref' into 'master'Douwe Maan
Fix issuable state indicator Closes gitlab-ee#4683 See merge request gitlab-org/gitlab-ce!17878
2018-03-23Show gitaly address instead of disk pathJacob Vosmaer
2018-03-23Merge branch '43771-improve-avatar-error-message' into 'master'Sean McGivern
Resolve "Indicate supported image formats in avatar error" Closes #43771 See merge request gitlab-org/gitlab-ce!17747
2018-03-23Update Prettier Print WIdth to 100Tim Zallmann
2018-03-23Merge branch ↵Kamil Trzciński
'43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information' into 'master' Resolve "Enabling Auto DevOps on an empty project gives you wrong information" Closes #43482 See merge request gitlab-org/gitlab-ce!17605
2018-03-23Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern
Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
2018-03-23Merge branch 'winh-deprecate-old-modal' into 'master'Filipa Lacerda
Rename modal.vue to deprecated_modal.vue See merge request gitlab-org/gitlab-ce!17438
2018-03-23Fix issuable state indicatorJan Provaznik
Now the issuable reference check works only in project scope, if we reference an issuable from a non-project resource (e.g. epics), then project is not set, and there is mismatch in generated issue references. This patch enables issuable reference state check also from group scope. Closes gitlab-ee#4683 Related to #30916
2018-03-23Merge branch 'increase-unicorn-memory-killer-limits' into 'master'Douwe Maan
Increase the memory limits used in the unicorn killer Closes gitlab-com/infrastructure#19 See merge request gitlab-org/gitlab-ce!17948
2018-03-23Merge branch 'tc-re-add-read-only-banner' into 'master'Stan Hu
Add read-only banner to all pages Closes #43937 See merge request gitlab-org/gitlab-ce!17798
2018-03-23Increase the memory limits used in the unicorn killerDJ Mountney
These limits were updated in our docs, and in omnibus some time ago. But the defaults in the source-install were missed.
2018-03-23Rollback to a set version instead of an arbitrary number of stepsStan Hu
The previously hard-coded value can fail when new migrations are introduced since multiple migrations may need to be rolled back atomically. Closes #40302
2018-03-23Merge branch 'ci-pipeline-commit-lookup' into 'master'Kamil Trzciński
Use porcelain commit lookup method on CI::CreatePipelineService Closes charts/helm.gitlab.io#291 See merge request gitlab-org/gitlab-ce!17911
2018-03-22Rearrange DeploymentPlatform methodsMayra Cabrera
- Change find_cluster_platform_kubernetes to ignore environment argument - Fix broken specs CE Port of: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5047/
2018-03-22Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4Stan Hu
See: * https://github.com/rails/rails-html-sanitizer/releases * https://github.com/flavorjones/loofah/releases
2018-03-22Fix EncodingHelper#clean blowing up on UTF-16BE stringsAhmad Sherif
Closes gitaly#1101
2018-03-22remove lintMicaël Bergeron
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 01:50:59 +0300