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
path: root/app
AgeCommit message (Collapse)Author
2017-12-21Merge branch 'master' into refactor-cluster-show-pagerefactor-cluster-show-pageMatija Čupić
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-20Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"Kim Carlbäcker
This reverts merge request !15712
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 ↵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-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-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-19Line up search dropdown with other nav dropdownsAnnabel Dunstone Gray
2017-12-19Fix onion-skin re-entering stateClement Ho
2017-12-19Remove related links in MR widget when empty stateClement Ho
2017-12-19Show inline edit button for issuesClement Ho
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-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-19Changed layout_nav to ES modulePhil Hughes
2017-12-19Remove transitionend event from GL dropdownPhil Hughes
2017-12-19Load commit in batches for pipelines#indexZeger-Jan van de Weg
Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
2017-12-19Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński
Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
2017-12-19BlobViewer::PackageJson - if private link to homepageMario de la Ossa
2017-12-19Do not generate links for private NPM modules in blob viewMario de la Ossa
2017-12-19added minChunks to the common_d3 bundleJose Ivan Vargas
2017-12-19Removed fills from stat_contributors_graphJose Ivan Vargas
2017-12-19cleaned up date_time_formattersJose Ivan Vargas
2017-12-19Restored the timeScaleFormat for the prometheus dashboardJose Ivan Vargas
2017-12-19Refactored d3 modules to instead of having a common_d3 dir, to use the micro ↵Jose Ivan Vargas
modules instead
2017-12-19corrected functionality from the stat_contributors_graphJose Ivan Vargas
2017-12-19fixed specs and the non-rendering stat_graph_contributors_graphJose Ivan Vargas
2017-12-19optimized d3 v4 with a custom made bundleJose Ivan Vargas
2017-12-19Modified contributors graph to use d3 v4Jose Ivan Vargas
2017-12-19Update d3 to v4 and migrated the prometheus dashboardJose Ivan Vargas
2017-12-18Merge branch 'fix-cluster-enviroment-missing' into refactor-cluster-show-pageMatija Čupić
2017-12-18Inverse the has_multiple_clusters? helper usageMatija Čupić
2017-12-18Remove block styling from search dropdownAnnabel Dunstone Gray
2017-12-18Fix sidebar height when performance bar enabledAnnabel Dunstone Gray
2017-12-18Remove all dropdown animations and set display: none if they're not openAnnabel Dunstone Gray
2017-12-18Remove extra height declarations in CSS; remove block styling from dropdownsAnnabel Dunstone Gray
2017-12-18Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'⛄️ Sean McGivern ⛄️
fix the commit diff discussion sending the wrong url See merge request gitlab-org/gitlab-ce!15988
2017-12-18Refactor cluster integration settings partialsMatija Čupić
2017-12-18Merge branch 'use-queue_namespace' into 'master'Stan Hu
Use queue_namespace rather than enqueue_in See merge request gitlab-org/gitlab-ce!15989
2017-12-18Merge branch 'ph-es-notes-module' into 'master'Filipa Lacerda
Export and use Notes ES module See merge request gitlab-org/gitlab-ce!15953