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-30Migrate Repository.FetchRemote to Gitalyee-gitaly-440-shell-fetch-remoteKim "BKC" Carlbäcker
- `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
2017-08-24Migrate Repository.FetchRemote to GitalyKim "BKC" Carlbäcker
- `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
2017-08-24Migrate Repository.FetchRemote to GitalyKim "BKC" Carlbäcker
- `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
2017-08-23Merge branch 'docs-multiple-assignees-and' into 'master'Victor Wu
Add docs for multiple assignees AND filtering See merge request !2745
2017-08-23Add docs for multiple assignees AND filteringClement Ho
2017-08-23Merge branch 'ce-to-ee-2017-08-23' into 'master'Dmitriy Zaporozhets
CE upstream: Wednesday Closes gitaly#463, #3194, gitlab-ce#36810, gitlab-ce#36685, gitlab-ce#36722, gitlab-ce#36519, and gitlab-ce#36661 See merge request !2741
2017-08-23Update CHANGELOG.md for 9.5.1Simon Knox
[ci skip]
2017-08-23Update CHANGELOG-EE.md for 9.5.1-eeSimon Knox
[ci skip]
2017-08-23Merge branch 'ee-gitaly-commit-patch' into 'master'Sean McGivern
[ee] Incorporate DiffService.CommitPatch Gitaly RPC See merge request !2729
2017-08-23Fix tests for the renamingLin Jen-Shin
2017-08-23Merge branch 'bvl-add-language-mapping-to-crowdin-config' into 'master'Douwe Maan
Add language mapping to crowdin.yml See merge request !2740
2017-08-23Resolve conflictsLin Jen-Shin
2017-08-23Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-23Lin Jen-Shin
* upstream/master: (49 commits) Implement new system note icons Remove tooltip from filtered search user Refactor `Admin::LogsController#show` Fix a potential timeout in `Gitlab::Logger.read_latest` Incorporate DiffService.CommitPatch Gitaly RPC Apply feedback Fix display of push events for removed refs Fix spacing with code block Fixes group policy specs on MySQL. Stub `ForkedStorageCheck.storage_available?` by default in all specs Add `:nested_groups` metadata to two subgroup-related specs Fix inability to test some project integrations img/merge_request_diff_file_navigation.png Merge request diff file navigation Raise GC Lease Timeout to 24h Use EachBatch concern to loop over batches Migration to remove pending delete projects with non-existing namespace Update VERSION to 9.6.0-pre Update CHANGELOG.md for 9.5.0 Update form to properly set the path ...
2017-08-23Merge branch 'master' into 'ee-gitaly-commit-patch'Sean McGivern
# Conflicts: # Gemfile # Gemfile.lock
2017-08-23Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern
Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
2017-08-23Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann
Remove tooltip from filtered search user Closes #36696 See merge request !13752
2017-08-23Add language mapping to crowdin.ymlBob Van Landuyt
And add the project_identifier & api key to be able to work with Crowdin-CLI
2017-08-23Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern
Fix displaying events of removed events and events without commit messages Closes #36685 and #36722 See merge request !13721
2017-08-23Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into ↵Douwe Maan
'master' Add migration to remove pending delete projects with non-existing namespace Closes #36541 See merge request !13598
2017-08-23Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan
Fix a potential timeout in `Gitlab::Logger.read_latest` See merge request !13751
2017-08-23Merge branch 'rs-stub-storage-availability-check' into 'master'Douwe Maan
Stub `ForkedStorageCheck.storage_available?` by default in all specs See merge request !13726
2017-08-23Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan
Fix inability to test some project integrations Closes gitlab-ee#3194 See merge request !13729
2017-08-23Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann
Disable webpack.optimize because it's breaking karma in EE See merge request !13720
2017-08-23Merge branch '33503-new-icons-for-system-notes' into 'master'Clement Ho
Implement new system note icons Closes #33503 See merge request !13673
2017-08-23Implement new system note iconsBryce Johnson
2017-08-23Remove tooltip from filtered search userClement Ho
2017-08-23Merge branch 'fix-group-policy-specs-on-mysql' into 'master'Robert Speicher
Fixes group policy specs on MySQL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36810 See merge request !13747
2017-08-23Merge branch 'rs-fix-master' into 'master'Stan Hu
Add `:nested_groups` metadata to two subgroup-related specs Closes #36811 and #36812 See merge request !13746
2017-08-23Refactor `Admin::LogsController#show`Robert Speicher
We should be defining the list of loggers in the controller, not the view.
2017-08-23Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher
If this method was called for a file that didn't exist, we attempted to first `build` it. But if the file wasn't writeable, such as a symlink pointing to an unmounted filesystem, the method would just hang and eventually timeout. Further, this was entirely pointless since we were creating a file and then shelling out to `tail`, eventually returning an empty Array. Now we just skip building it and return the empty Array straight away.
2017-08-22Merge branch '36779-update-kubernetes-install-docs' into 'master'Marcia Ramos
Update Kubernetes install docs Closes #36779 See merge request !13730
2017-08-22Merge branch '3205-implement-new-ee-only-system-note-icons' into 'master'Clement Ho
Implement new EE-only system note icons Closes #3205 See merge request !2713
2017-08-22Implement new EE-only system note iconsBryce Johnson
2017-08-22Incorporate DiffService.CommitPatch Gitaly RPCAlejandro Rodríguez
2017-08-22Incorporate DiffService.CommitPatch Gitaly RPCAlejandro Rodríguez
2017-08-22Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho
Resolve "Badges should not be HUGE" Closes #36496 See merge request !13635
2017-08-22Apply feedbackJoshua Lambert
2017-08-22Merge branch 'sh-instrument-geo-file-downloads' into 'master'Robert Speicher
Log Geo file download attempts and status See merge request !2722
2017-08-22Fix display of push events for removed refsYorick Peterse
This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
2017-08-22Fix spacing with code blockJoshua Lambert
2017-08-22Merge branch 'update-monaco-loader-test' into 'master'Jacob Schatz
Fix monaco loader test See merge request !13682
2017-08-22Fixes group policy specs on MySQL.Tiago Botelho
2017-08-22Merge branch '3218-js-load-flickering' into 'master'Clement Ho
Remove unneeded sidebar class Closes #3218 See merge request !2738
2017-08-22Merge branch 'docs-merge-request-diff-nav' into 'master'Marcia Ramos
Docs merge request diff nav See merge request !13743
2017-08-22Stub `ForkedStorageCheck.storage_available?` by default in all specsRobert Speicher
Add `:broken_storage` metadata to examples to disable this behavior only when necessary.
2017-08-22Add `:nested_groups` metadata to two subgroup-related specsRobert Speicher
Prevents these from failing on MySQL. Closes #36811 and #36812.
2017-08-22Merge branch 'git-gc-raise-lease-timeotu' into 'master'Sean McGivern
Raise Git GC (Housekeeping) Lease Timeout to 24h See merge request !13719
2017-08-22Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński
Enforce namespace of Kubernetes to lowercase Closes #34762 See merge request !13732
2017-08-22Merge branch 'repmgr-automation-docs'Marin Jankovski
2017-08-22Fix inability to test some project integrationsRubén Dávila