- 23 Mar, 2018 40 commits
-
-
Robert Speicher authored
Fix a test that is going to break, that has not broken yet See merge request gitlab-org/gitlab-ce!17966
-
Clement Ho authored
Cleanup test for disabling comment submit button See merge request gitlab-org/gitlab-ce!17930
-
Stan Hu authored
Merge branch '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
-
Filipa Lacerda authored
Merge branch '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
-
Sean McGivern authored
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).
-
Filipa Lacerda authored
Resolve "Problem with prettier setting trailingComma: all" Closes #44589 See merge request gitlab-org/gitlab-ce!17967
-
Mike Greiling authored
-
Mike Greiling authored
-
Jose Ivan Vargas authored
-
Marcia Ramos authored
Move GitLab.com settings under main docs See merge request gitlab-org/gitlab-ce!17968
-
Douwe Maan authored
Use gitlab-shell 7.1.1 See merge request gitlab-org/gitlab-ce!17959
-
Mike Greiling authored
-
Mike Greiling authored
-
Robert Speicher authored
Fix EncodingHelper#clean blowing up on UTF-16BE strings Closes gitaly#1101 See merge request gitlab-org/gitlab-ce!17943
-
Achilleas Pipinellis authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Robert Speicher authored
Rollback to a set version instead of an arbitrary number of steps Closes #40302 See merge request gitlab-org/gitlab-ce!17947
-
Robert Speicher authored
Resolve "Autolinking includes trailing exclamation marks" Closes #44587 See merge request gitlab-org/gitlab-ce!17965
-
Nick Thomas authored
-
Filipa Lacerda authored
Add Vue resource interceptor to performance bar See merge request gitlab-org/gitlab-ce!17915
-
Sean McGivern authored
-
Nick Thomas authored
HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273
-
Robert Speicher authored
Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4 Closes #44554 See merge request gitlab-org/gitlab-ce!17945
-
Sean McGivern authored
Update the menu information to access "Schedules" page See merge request gitlab-org/gitlab-ce!17957
-
Clement Ho authored
Update Prettier Print Width to 100 See merge request gitlab-org/gitlab-ce!17953
-
Douwe Maan authored
Resolve "Limit number of failed logins using LDAP for authentication" Closes #43525 See merge request gitlab-org/gitlab-ce!17886
-
Sean McGivern authored
Request Chinese Traditional proofreader permissions. See merge request gitlab-org/gitlab-ce!17762
-
Jacob Vosmaer authored
-
Bertrand Jamin authored
-
Sean McGivern authored
Show gitaly address instead of disk path See merge request gitlab-org/gitlab-ce!17954
-
Douwe Maan authored
Fix issuable state indicator Closes gitlab-ee#4683 See merge request gitlab-org/gitlab-ce!17878
-
Jacob Vosmaer authored
-
Sean McGivern authored
Resolve "Indicate supported image formats in avatar error" Closes #43771 See merge request gitlab-org/gitlab-ce!17747
-
Tim Zallmann authored
-
Kamil Trzciński authored
Merge branch '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
-
Sean McGivern authored
Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
-
Filipa Lacerda authored
Rename modal.vue to deprecated_modal.vue See merge request gitlab-org/gitlab-ce!17438
-
Jan Provaznik authored
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
-
Douwe Maan authored
Increase the memory limits used in the unicorn killer Closes gitlab-com/infrastructure#19 See merge request gitlab-org/gitlab-ce!17948
-