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-12-11Merge branch 'sh-revert-mr-22911' into 'master'Grzegorz Bizon
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'" See merge request gitlab-org/gitlab-ce!23715
2018-12-11Merge branch '55138-fix-mr-discussions-count' into 'master'Phil Hughes
Fix MR discussion counts being off Closes #55138 See merge request gitlab-org/gitlab-ce!23710
2018-12-11Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into ↵Stan Hu
'master'" This reverts commit 793be43b35bc8cd2a9effe38280417ee198647cb, reversing changes made to 8d0b4872ba3ff787c4067618f48b60bd24466c74. For projects not using any CI, enabling merge only when pipeline succeeds caused merge requests to be in unmergeable state, which caused significant confusion. See https://gitlab.com/gitlab-org/gitlab-ce/issues/55144 for more details.
2018-12-11Merge branch '11-6-update-gitignore' into 'master'Robert Speicher
Update the .gitignore See merge request gitlab-org/gitlab-ce!23706
2018-12-11Minor refactor to GCP service classesMayra Cabrera
- Split logger call for readibility - Reduce code duplication by adding new method
2018-12-11Fix MR discussion counts being offPaul Slaughter
**What was the issue?** Notes can be unresolved, but not resolvable. Without this, the unresolvedDiscussionsCount was inflated. **References** https://gitlab.com/gitlab-org/gitlab-ce/issues/55138
2018-12-11Merge branch '11-6-update-license' into 'master'Robert Speicher
Update License info for 11.6 feature freeze See merge request gitlab-org/gitlab-ce!23707
2018-12-11Merge branch 'ichernikov/add-asignee-to-mr' into 'master'Mark Lapierre
[QA] Extend create_merge_request_spec to set assignee to MR See merge request gitlab-org/gitlab-ce!23488
2018-12-11Merge branch 'upgrade-to-workhorse-7.6.0' into 'master'Robert Speicher
Upgrade to workhorse 7.6.0: See merge request gitlab-org/gitlab-ce!23694
2018-12-11Upgrade to workhorse 7.6.0:Andrew Newdigate
2018-12-11Merge branch 'sh-json-serialize-broadcast-messages' into 'master'Robert Speicher
Avoid caching BroadcastMessage as an ActiveRecord object Closes #55034 See merge request gitlab-org/gitlab-ce!23662
2018-12-11Update License info for 11.6 feature freezeAlex Hanselka
2018-12-11Update the .gitignoreAlex Hanselka
2018-12-10Reduce N+1 from Activity Dashboard and BanzaiGabriel Mazetto
There is a combination of few strategies implemented here: 1. Few relations were eager loaded 2. Changed few polymorphic routes to specific ones so we don't have to use `#becomes(Namespace)` which doesn't preserve association cache
2018-12-10Allow GitHub imports via token even if OAuth2 provider not configuredStan Hu
Previously, the GitHub importer would only work if the site configured an OAuth2 provider were configured. Users attempting to import via a GitHub personal access token would see an Error 500 due to a failed redirection. We fix this by only doing the redirection if the provider has been configured and allowing users to see the new import page. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/38524
2018-12-10Merge branch 'sh-bump-sentry-raven-gem' into 'master'Robert Speicher
Bump sentry-raven gem to 2.7.4 See merge request gitlab-org/gitlab-ce!23699
2018-12-10Merge branch 'profile-fixing' into 'master'Annabel Dunstone Gray
Fix profile_header bottom margin, #51807. Closes #51807 See merge request gitlab-org/gitlab-ce!23168
2018-12-10Method go_to_activity isn't privateMark Lapierre
Also order methods alphabetically
2018-12-10Visit project page after pushingMark Lapierre
2018-12-10Update tests and Resources to use new file buttonMark Lapierre
The 'Create new' dropdown is no longer available on a blank project so use the 'New file' button instead.
2018-12-10Update E2E tests for Project overview UI changesMark Lapierre
Includes updates to how clone URLs are accessed.
2018-12-10Merge branch '49713-main-navbar-is-broken-in-certain-viewport-widths' into ↵Annabel Dunstone Gray
'master' Resolve "Main navbar is broken in certain viewport widths" Closes #49713 See merge request gitlab-org/gitlab-ce!23348
2018-12-10Merge branch 'fail-danger-in-ci' into 'master'Rémy Coutable
Don't allow Danger to fail in CI any more Closes gitlab-org/release/framework#21 See merge request gitlab-org/gitlab-ce!23695
2018-12-10Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'Douwe Maan
Fix a frozen string error in lib/gitlab/utils.rb Closes #55116 See merge request gitlab-org/gitlab-ce!23690
2018-12-10Bump sentry-raven gem to 2.7.4Stan Hu
Contains only minor fixes from 2.7.2: https://github.com/getsentry/raven-ruby/releases
2018-12-10Remove STI #becomes call from Dashboard indexGabriel Mazetto
By defining the correct route helper path instead of relying on the polymorphic route, we don't invalidate the eager-loaded relations. This change removes remaining N+1 queries
2018-12-10Eager-load relations for Explore::ProjectsControllerGabriel Mazetto
This removes remaining N+1 queries
2018-12-10Eager-load relations for Dashboard::ProjectsControllerGabriel Mazetto
This removes remaining N+1 queries
2018-12-10Merge branch 'sh-remove-gitlab-shell-include' into 'master'Rémy Coutable
Remove unnecessary includes of ShellAdapter See merge request gitlab-org/gitlab-ce!23607
2018-12-10Merge branch 'winh-timecop-frontend-fixtures' into 'master'Rémy Coutable
Set a fixed date for frontend fixtures See merge request gitlab-org/gitlab-ce!22672
2018-12-10Resolve main nav clipping in certain breakpointsDennis Tang
Makes the following changes in order to have all the items of the top nav fit within all of the new Bootstrap 4 breakpoints: - Change GitLab logo to show only on desktop breakpoint (lg and up) - Move margin from logo to logo text, saving 8px - Move the following icon links to the "More" nav dropdown - Instance Statistics (ConDev Index) - Admin area (if Admin) - Sherlock Transactions (if enabled) - Removed separator between Admin icons - Change search input width from 240px to 200px - Move "Activity", "Milestone", and "Snippets" into "More" menu on lg breakpoints - Show "More" menu of lg breakpoints
2018-12-10Merge branch 'backport-ee-helper-changes' into 'master'Robert Speicher
Backport some EE helper changes See merge request gitlab-org/gitlab-ce!23631
2018-12-10Don't allow Danger to fail in CI any moreYorick Peterse
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20654 this job was marked as allowing failures, but this allows developers to ignore the results that Danger produces. Since it's not clear why the job was allowed to fail, and since it's somewhat counter productive, we no longer allow it to fail.
2018-12-10Merge branch 'dimitrieh-master-patch-42734' into 'master'Robert Speicher
Improve feature proposal template for improved product thinking See merge request gitlab-org/gitlab-ce!23190
2018-12-10Improve feature proposal template for improved product thinkingDimitrie Hoekstra
2018-12-10Add more structured JSON logging to Kubernetes classesDylan Griffith
2018-12-10Fix a frozen string error in lib/gitlab/utils.rbRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-10Merge branch '55104-frozenerror-can-t-modify-frozen-string' into 'master'Douwe Maan
Fix a frozen string error in app/mailers/notify.rb Closes #55104 See merge request gitlab-org/gitlab-ce!23683
2018-12-10Merge branch 'winh-dropdown-item-padding' into 'master'Kushal Pandya
Adjust dropdown item and header padding to comply with design specs See merge request gitlab-org/gitlab-ce!23552
2018-12-10Adjust dropdown item and header padding to comply with design specsWinnie Hellmann
2018-12-10Apply existing dropdown item styles to .dropdown-item classWinnie Hellmann
2018-12-10Merge branch '55090-fix-group-clusters-no-project-namespace' into 'master'Kamil Trzciński
Resolve "Project Namespace field should be removed from Group Cluster, Add existing" Closes #55090 See merge request gitlab-org/gitlab-ce!23679
2018-12-10Merge branch 'qa-reuse-chrome-profile' into 'master'Sanad Liaquat
Add QA option to use the same Chrome profile Closes #52255 See merge request gitlab-org/gitlab-ce!23576
2018-12-10Extract Clusters::BuildServiceDylan Griffith
2018-12-10Fix a frozen string error in app/mailers/notify.rbRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-10Set a fixed date for frontend fixturesWinnie Hellmann
2018-12-10Remove boxes around code commentsAnnabel Dunstone Gray
2018-12-10Restore top margin for active discussion notesGeorge Tsiolis
2018-12-10Restore diff-file discussion paddingGeorge Tsiolis
2018-12-10Fix discussion reply holder paddingGeorge Tsiolis
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 15:04:36 +0300