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
2018-05-03Merge branch 'ide-tree-changes-count' into 'master'Filipa Lacerda
Added changes count to web IDE folder See merge request gitlab-org/gitlab-ce!18452
2018-05-03Merge branch 'change-docs-license' into 'master'Rémy Coutable
Change the docs license to CC BY-SA See merge request gitlab-org/gitlab-ce!18718
2018-05-03Merge branch 'update-omniauth-github' into 'master'Rémy Coutable
update omniauth-github ~> 1.1.1 to ~> 1.3 See merge request gitlab-org/gitlab-ce!18668
2018-05-03Change the docs license to CC BY-SAAchilleas Pipinellis
As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891
2018-05-03Merge branch 'bw-add-console-message' into 'master'Robert Speicher
Output some useful information when running the rails console See merge request gitlab-org/gitlab-ce!18697
2018-05-03Output some useful information when running the rails consoleBrett Walker
2018-05-03Merge branch '45970-additional-signout-needed' into 'master'Douwe Maan
Ensure that spec/features/issues/user_uses_slash_commands_spec tests run locally Closes #45970 See merge request gitlab-org/gitlab-ce!18713
2018-05-03update omniauth-github ~> 1.1.1 to ~> 1.3Pirate Praveen
2018-05-03ensure users are signed out properly in user_uses_slash_commands_spec.rbLukas Eipert
See https://gitlab.com/gitlab-org/gitlab-ce/issues/45970
2018-05-03Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes
Platform: Use component to emit event on Subscription toggle component instead of eventHub See merge request gitlab-org/gitlab-ce!18703
2018-05-03Merge branch 'update-devise' into 'master'Douwe Maan
update devise 4.2 -> 4.4 See merge request gitlab-org/gitlab-ce!18667
2018-05-03Emit `toggleSidebar` event on component when icon is clickedKushal Pandya
2018-05-03Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya
2018-05-03Emit `toggleSubscription`, `toggleSidebar` events on componentKushal Pandya
2018-05-03update devise 4.2 -> 4.4Pirate Praveen
2018-05-03Merge branch 'blackst0ne-rails5-fix-trusted-proxies' into 'master'Rémy Coutable
[Rails5] Fix trusted proxies See merge request gitlab-org/gitlab-ce!18705
2018-05-03Merge branch 'blackst0ne-remove-spinach-group-active-tab-feature' into 'master'Rémy Coutable
CE port of "Remove `features/group_active_tab.feature`" See merge request gitlab-org/gitlab-ce!18706
2018-05-03CE port of "Remove `features/group_active_tab.feature`"blackst0ne
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5554
2018-05-03[Rails5] Fix trusted proxiesblackst0ne
There is a bug in trusted proxies: https://github.com/rails/rails/issues/5223 This commit adds a monkey patch to fix the bug. Example of errors: ``` 1) trusted_proxies with default config preserves private IPs Failure/Error: expect(request.ip).to eq('10.1.5.89') expected: "10.1.5.89" got: nil (compared using ==) # ./spec/initializers/trusted_proxies_spec.rb:12:in `block (3 levels) in <top (required)>' 2) trusted_proxies with default config filters out localhost Failure/Error: expect(request.ip).to eq('10.1.5.89') expected: "10.1.5.89" got: "1.1.1.1" (compared using ==) # ./spec/initializers/trusted_proxies_spec.rb:18:in `block (3 levels) in <top (required)>' ```
2018-05-03Merge branch 'update-environment-item-action-buttons-icons' into 'master'Filipa Lacerda
Update environment item action buttons icons Closes #38755 See merge request gitlab-org/gitlab-ce!18632
2018-05-03Merge branch 'blackst0ne-rails-fix-params-passed-to-merge-worker' into 'master'Rémy Coutable
[Rails5] Fix params passed to MergeWorker See merge request gitlab-org/gitlab-ce!18701
2018-05-03[Rails5] Fix params passed to MergeWorkerblackst0ne
2018-05-03Merge branch 'ide-improve-commit-panel' into 'master'Phil Hughes
Improve Web IDE Commit Panel Closes #44837 See merge request gitlab-org/gitlab-ce!18234
2018-05-03Improve Web IDE Commit PanelAndré Luís
2018-05-03Merge branch 'add_pass_through_to_strip_html_utility' into 'master'Phil Hughes
Add pass through to stripHtml for undefined and null inputs See merge request gitlab-org/gitlab-ce!18690
2018-05-03Add pass through to stripHtml for undefined and null inputsOlivier Gonzalez
2018-05-03Update environment item action buttons iconsGeorge Tsiolis
2018-05-03Merge branch 'ce-jej/identity-relates-to-saml' into 'master'Douwe Maan
[CE] Backport Identity.uniqueness_scope from EE See merge request gitlab-org/gitlab-ce!18689
2018-05-03Merge branch 'zj-fork-opt-out' into 'master'Douwe Maan
Forking repositories is handled by Gitaly by default See merge request gitlab-org/gitlab-ce!18679
2018-05-03Merge branch 'change-font-for-tables-inside-diff-discussions' into 'master'Filipa Lacerda
Change font for tables inside diff discussions Closes #45485 See merge request gitlab-org/gitlab-ce!18660
2018-05-03Merge branch 'docs-use-variables-deploy-policy-for-staging-and-production' ↵Achilleas Pipinellis
into 'master' Include documentation about STAGING_ENABLED variable for AutoDevops See merge request gitlab-org/gitlab-ce!18675
2018-05-03Include documentation about STAGING_ENABLED variable for AutoDevopsMayra Cabrera
2018-05-03Merge branch 'winh-new-mergerequest-branch-picker' into 'master'Clement Ho
Load branches on new merge request page asynchronously Closes #37477 See merge request gitlab-org/gitlab-ce!18315
2018-05-03Load branches on new merge request page asynchronouslyWinnie Hellmann
2018-05-03Update CHANGELOG.md for 10.7.3Mayra Cabrera
[ci skip]
2018-05-02Merge branch 'zj-repo-checksum-opt-out' into 'master'Robert Speicher
Compute repository checksum by default Closes gitaly#1146 See merge request gitlab-org/gitlab-ce!18648
2018-05-02Merge branch 'tz-optimize-emoji-sprite' into 'master'Clement Ho
Optimize Emoji Sprite Handling See merge request gitlab-org/gitlab-ce!18576
2018-05-02Optimize Emoji Sprite HandlingTim Zallmann
2018-05-02Forking repositories is handled by Gitaly by defaultZeger-Jan van de Weg
Initial Rails implementation was introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16018, and acceptance testing was done in https://gitlab.com/gitlab-org/gitaly/issues/881 Part of https://gitlab.com/gitlab-org/gitaly/issues/817
2018-05-02Merge branch 'revert-75f6e91f' into 'master'Phil Hughes
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'" Closes #45979 See merge request gitlab-org/gitlab-ce!18692
2018-05-02Merge branch 'zj-namespace-service-mandatory' into 'master'Douwe Maan
Remove old GitLab Shell namespace actions implementations See merge request gitlab-org/gitlab-ce!18681
2018-05-02Merge branch '45761-replace-actionview-time_ago_in_words' into 'master'Rémy Coutable
Deprecation of ActionView's time_ago_in_words Closes #45761 See merge request gitlab-org/gitlab-ce!18607
2018-05-02Merge branch 'increase-new-issue-metadata-form-margin' into 'master'Clement Ho
Increase new issue metadata form margin Closes #44134 See merge request gitlab-org/gitlab-ce!18630
2018-05-02Merge branch 'jprovazn-generic-error' into 'master'Nick Thomas
Save and expose only generic merge error See merge request gitlab-org/gitlab-ce!18646
2018-05-02Merge branch ↵Douwe Maan
'45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master' Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb" Closes #45970 See merge request gitlab-org/gitlab-ce!18687
2018-05-02Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"Rémy Coutable
This reverts merge request !18682
2018-05-02Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master'Mike Greiling
Move WorkInProgress vue component See merge request gitlab-org/gitlab-ce!17536
2018-05-02Merge branch 'refactor/move-sidebar-time-tracking-vue-component' into 'master'Filipa Lacerda
Move SidebarTimeTracking vue component See merge request gitlab-org/gitlab-ce!18677
2018-05-02Merge branch 'refactor/move-no-tracking-pane-vue-component' into 'master'Phil Hughes
Move TimeTrackingNoTrackingPane vue component See merge request gitlab-org/gitlab-ce!18676
2018-05-02created computed propsPhil Hughes
removed unused parameters