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-12-21Merge branch 'master' into refactor-cluster-show-pagerefactor-cluster-show-pageMatija Čupić
2017-12-21Merge branch ↵Robert Speicher
'41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb' into 'master' Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url Closes #41291 See merge request gitlab-org/gitlab-ce!16052
2017-12-21Stub old image diff urlClement Ho
2017-12-21Merge branch 'jivl-replace-d3-v3-v4' into 'master'Mike Greiling
Update d3 to v4 to enable tree shaking (and reduce the size of our webpack bundles) Closes #37013 See merge request gitlab-org/gitlab-ce!15585
2017-12-21Merge branch 'revert-b655a4a7' into 'master'Robert Speicher
Revert "Move Repository#write_ref to Git::Repository#write_ref" Closes #41143 [ci skip] See merge request gitlab-org/gitlab-ce!16055
2017-12-20Merge branch 'zj-empty-repo-importer' into 'master'Stan Hu
Migrate to Project#empty_repo? Closes #41326 See merge request gitlab-org/gitlab-ce!16054
2017-12-20Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"Kim Carlbäcker
This reverts merge request !15712
2017-12-20Migrate to Project#empty_repo?Zeger-Jan van de Weg
2017-12-20Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of ↵Rémy Coutable
#diff_file_blob_raw_url Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-20Environment pattern -> Environment scopeMatija Čupić
2017-12-20Merge branch 'layout-nav-es-module' into 'master'Filipa Lacerda
Changed layout_nav to ES module See merge request gitlab-org/gitlab-ce!16003
2017-12-20Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable
Resolve "Search merge-requests with API" Closes #38318 See merge request gitlab-org/gitlab-ce!16029
2017-12-20Merge branch 'docs-qa-extend-how-to-run-specific-test' into 'master'Grzegorz Bizon
Specify how we're utilizing rspec for bin/qa See merge request gitlab-org/gitlab-ce!16040
2017-12-20Merge branch ↵Douwe Maan
'39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master' Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted Closes #39246 See merge request gitlab-org/gitlab-ce!15844
2017-12-20Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan
Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
2017-12-20Specify how we're utilizing rspec hereLin Jen-Shin
2017-12-20Merge branch 'master' into layout-nav-es-moduleFilipa Lacerda
* master: (21 commits) Prevent some specs from mangling the gitlab-shell checkout Line up search dropdown with other nav dropdowns Fix onion-skin re-entering state Remove related links in MR widget when empty state Show inline edit button for issues Fix tags in the Activity tab not being clickable Fix shortcut links on help page Don't link LFS-objects multiple times. [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other Update axios.md Remove transitionend event from GL dropdown Preserve gem path so that we use the same gems Load commit in batches for pipelines#index BlobViewer::PackageJson - if private link to homepage Do not generate links for private NPM modules in blob view Remove block styling from search dropdown Fix sidebar height when performance bar enabled Remove all dropdown animations and set display: none if they're not open ...
2017-12-20Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'Phil Hughes
Remove animations from dropdowns Closes #41186 See merge request gitlab-org/gitlab-ce!15968
2017-12-20Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'Douwe Maan
Don't link LFS-objects multiple times. Closes #41241 See merge request gitlab-org/gitlab-ce!16006
2017-12-20Add optional `search` param for Merge Requests APIMark Fletcher
2017-12-20Employ declared_params in finder methods for MR and Issue API listsMark Fletcher
- Ensure that unwanted params are no passed to actual finder classes
2017-12-20Call the correct method in the BlocksJsonSerialization specRobert Speicher
2017-12-20Only include the user's ID in the time_spent command's update hashRobert Speicher
Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
2017-12-20Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher
2017-12-20Use UserSerializer instead of `User.to_json`Robert Speicher
2017-12-20Accept arguments to blocked JSON serialization methodsRobert Speicher
2017-12-20Add BlocksJsonSerialization model concern and include it in UserRobert Speicher
2017-12-19Merge branch '41264-gitlab-projects-spec-failures' into 'master'Robert Speicher
Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb Closes #41264 See merge request gitlab-org/gitlab-ce!16015
2017-12-19Prevent some specs from mangling the gitlab-shell checkoutNick Thomas
2017-12-19Line up search dropdown with other nav dropdownsAnnabel Dunstone Gray
2017-12-19Merge branch 'fix-onion-skin-reenter' into 'master'Jacob Schatz
Fix onion-skin re-entering state Closes #38533 See merge request gitlab-org/gitlab-ce!15815
2017-12-19Fix onion-skin re-entering stateClement Ho
2017-12-19Merge branch 'remove-links-mr-empty-state' into 'master'Jacob Schatz
Remove related links in MR widget when empty state Closes #36764 See merge request gitlab-org/gitlab-ce!15888
2017-12-19Remove related links in MR widget when empty stateClement Ho
2017-12-19Merge branch 'show-inline-edit-btn' into 'master'Jacob Schatz
Show inline edit button for issues Closes #37474 See merge request gitlab-org/gitlab-ce!15812
2017-12-19Show inline edit button for issuesClement Ho
2017-12-19Merge branch '33028-event-tag-links' into 'master'Rémy Coutable
Fix tags in the Activity tab not being clickable Closes #33028 See merge request gitlab-org/gitlab-ce!15996
2017-12-19Fix tags in the Activity tab not being clickableMario de la Ossa
2017-12-19Merge branch '36020-private-npm-modules' into 'master'Douwe Maan
Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002
2017-12-19Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher
Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
2017-12-19Merge branch 'fix-docs-help-shortcut' into 'master'Phil Hughes
Fix shortcut links on help page Closes #41097 See merge request gitlab-org/gitlab-ce!16001
2017-12-19Fix shortcut links on help pageClement Ho
2017-12-19Don't link LFS-objects multiple times.Bob Van Landuyt
If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
2017-12-19Merge branch 'fl-update-axios-docs' into 'master'Phil Hughes
Update axios.md See merge request gitlab-org/gitlab-ce!16008
2017-12-19Merge branch 'preserve-gem-path' into 'master'Rémy Coutable
Preserve gem path so that we use the same gems See merge request gitlab-org/gitlab-ce!15986
2017-12-19Merge branch 'master' into fl-update-axios-docsFilipa Lacerda
* master: Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other
2017-12-19[CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov
2017-12-19Merge branch 'docs/omnibus-2452-tidy-gitlab-application' into 'master'Marin Jankovski
Tidy up the documentation of Gitlab HA/Gitlab Application See merge request gitlab-org/gitlab-ce!16011
2017-12-19Tidy up the documentation of Gitlab HA/Gitlab ApplicationRichard Clamp
2017-12-19Merge branch 'except-qa-and-docs' into 'master'Grzegorz Bizon
Make sure two except won't overwrite each other See merge request gitlab-org/gitlab-ce!16010
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 09:42:51 +0300