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
2017-08-09Don't require stackprof in GemfileRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09Merge branch ↵Rémy Coutable
'34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute' into 'master' Resolve "user_avatar URL in push event webhook JSON payload is relative, should be absolute" Closes #34339 See merge request !13401
2017-08-09Merge branch 'synchronous_korean_translation_in_zanata' into 'master'Rémy Coutable
Synchronous Korean translation in zanata See merge request !13402
2017-08-09Merge branch 'patch-24' into 'master'Achilleas Pipinellis
there are 3 dots but it says four products. fixed See merge request !13129
2017-08-09Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master'Achilleas Pipinellis
Remove trailing comma in System Hooks payload examples Closes #36071 See merge request !13367
2017-08-09Merge branch 'sh-structured-log-docs' into 'master'Achilleas Pipinellis
Add docs on structured logging in GitLab See merge request !13396
2017-08-09Synchronous Korean translation in zanata黄涛
2017-08-09Use full path of user's avatar in webhooksblackst0ne
2017-08-09Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda
Restore blob fixture for JavaScript tests Closes #36187 See merge request !13399
2017-08-09Restore blob fixture for JavaScript testswinh
2017-08-09Add docs on structured logging in GitLabStan Hu
[ci skip]
2017-08-08Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher
2017-08-08Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher
Add rubocop-gitlab-security gem See merge request !12177
2017-08-08Merge branch 'fly-out-nav-collapsed' into 'master'Annabel Dunstone Gray
Fix fly-out navigation not showing for active items in collapsed sidebar See merge request !13353
2017-08-08Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes
2017-08-08Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern
Fix Profile > Preferences feature specs See merge request !13382
2017-08-08Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz
Remove repo editor feature flag from RC1 See merge request !13379
2017-08-08Merge branch '36169-fix-master' into 'master'Sean McGivern
Fix a broken Events API spec See merge request !13381
2017-08-08Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable
Unset BUNDLE_GEMFILE when installing Gitaly See merge request !13378
2017-08-08Merge branch ↵Rémy Coutable
'36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359
2017-08-08Re-enable SqlInjection and CommandInjectionBrian Neel
2017-08-08Fix Profile > Preferences feature specsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Merge branch ↵Filipa Lacerda
'35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
2017-08-08Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray
Fix fly-out width when it has long items See merge request !13371
2017-08-08Fix a broken Events API specRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets
Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
2017-08-08Revert "Add user_dropdown_link to prompt users to turn on new repo"Mike Greiling
This reverts commit 79f94c8d221f9391f48899808b7a36e3905dab83.
2017-08-08Merge branch 'header-z-index-fix' into 'master'Annabel Dunstone Gray
Fixed modals being below navbar See merge request !13355
2017-08-08hide the feature flag for the repo editor featureMike Greiling
2017-08-08Revert "Combine 'turn on/off' user dropdown links into 'experimental ↵Mike Greiling
features' link and andded 'experimental features' heading for user preferences page" This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
2017-08-08Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern
Raise encoding confidence threshold to 50 Closes #35098 See merge request !12990
2017-08-08Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer
2017-08-08Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern
Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
2017-08-08Merge branch 'project-homepage-activity' into 'master'Tim Zallmann
Fixed activity not loading on project homepage See merge request !13373
2017-08-08Make sure that we have author and committerLin Jen-Shin
In case we don't have it setup in ~/.gitconfig
2017-08-08disable file upload button while uploadingSimon Knox
hide placeholder text when files have been added vertically center dropzone area content close modal after file upload succeeds
2017-08-08Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master'Clement Ho
Fix bar chart does not display label at hour 0 Closes #35136 See merge request !13330
2017-08-08Fix bar chart does not display label at hour 0Jason Dai
2017-08-08Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon
Restrict InlineJavaScript for haml_lint to dev and test environment Closes omnibus-gitlab#2658 See merge request !13364
2017-08-08Fixed activity not loading on project homepagePhil Hughes
2017-08-08Merge branch 'project_events_noteable_iid' into 'master'Rémy Coutable
Expose noteable_iid in Note See merge request !13265
2017-08-08Expose noteable_iid in Notesue445
2017-08-08Fix fly-out width when it has long itemsPhil Hughes
2017-08-08Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern
Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name… See merge request !13368
2017-08-08Add a test to show that threshold 40 would corruptLin Jen-Shin
If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40, this test case would not pass. If we raise to 50, this would pass. Note that if in the future rugged didn't return corrupt data, this would be less relevant. But still icu recommend the threshold to be 50, we should just stick with 50.
2017-08-08Add changelog entryLin Jen-Shin
2017-08-08Raise encoding confidence threshold to 50Lin Jen-Shin
It is recommended that we set this to 50: https://gitlab.com/gitlab-org/gitlab-ce/issues/35098#note_35036746 In this particular issue, the confidence was 42 for Shift JIS, but in fact that's encoded in UTF-8 just with a single bad character. In this case, we shouldn't try to treat it as Shift JIS, but just treat it as UTF-8 and remove invalid bytes. Treating it like Shift JIS would corrupt the whole data. Unfortunately, the diff which would cause this could not be disclosed therefore we can't use it as a test example.
2017-08-08Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵Rémy Coutable
name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵Rémy Coutable
name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵Rémy Coutable
'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313