- 04 May, 2018 24 commits
-
-
Rémy Coutable authored
Resolve "ee-specific-lines-check should not check against CE master" Closes #5869 See merge request gitlab-org/gitlab-ee!5564
-
-
Nick Thomas authored
Merge branch '4957-projectsyncworker-should-skip-projects-that-have-a-broken-gitaly-shard' into 'master' Resolve "ProjectSyncWorker should skip projects that have a broken Gitaly shard" Closes #4957 See merge request gitlab-org/gitlab-ee!5514
-
Nick Thomas authored
Merge branch '4957-projectsyncworker-should-skip-projects-that-have-a-broken-gitaly-shard-3' into 'master' Shard name vs. Shard updates, general tech debt cleanup Closes #4957 See merge request gitlab-org/gitlab-ee!5555
-
Ash McKenzie authored
-
Ash McKenzie authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
If CE master is ahead of EE master, and the CE branch was forked from CE master, then the CE branch would contain a lot of changes which aren't presented in EE master, therefore they're not presented in EE branch, either. In this case, we need to remove the commits from CE master which aren't merged into EE yet. So we want to rebase CE branch onto CE/EE merge base, with ce_fetch_base and ce_fetch_head, where ce_fetch_base is the merge base of CE master and CE branch, and ce_fetch_head is the original HEAD of CE branch. This should make sure there's no extra commits involved. The only way it could fail would be conflicts during rebase, which ideally should not happen at all. This doesn't mean it's impossible to happen, but given the reason we make the CE branch, it should only contain minimum changes from EE to CE, which shouldn't conflict. Let's try this and see and investigate if conflicts happen.
-
Douwe Maan authored
Group SAML SSO Page (But not the parts to make the sign in button work) See merge request gitlab-org/gitlab-ee!5508
-
Filipa Lacerda authored
Fix network error message styling on Geo admin dashboard Closes #5806 See merge request gitlab-org/gitlab-ee!5530
-
Tim Zallmann authored
Resolve "Geo: Don't block "Edit" and "Remove" buttons while status is loading" Closes #5351 See merge request gitlab-org/gitlab-ee!5526
-
James Edwards-Jones authored
-
Rémy Coutable authored
Ignore db/schema.rb and locale/gitlab.pot in `ee-specific-lines-check` See merge request gitlab-org/gitlab-ee!5571
-
Dylan Griffith authored
Resolve conflicts in app/models/group.rb db/schema.rb lib/api/entities.rb spec/serializers/pipeline_serializer_spec.rb
-
GitLab Bot authored
# Conflicts: # app/models/group.rb # db/schema.rb # lib/api/entities.rb # spec/serializers/pipeline_serializer_spec.rb [ci skip]
-
Kamil Trzciński authored
Shared CI runners for groups See merge request gitlab-org/gitlab-ce!9646
-
Rémy Coutable authored
CE upstream - 2018-05-03 18:26 UTC See merge request gitlab-org/gitlab-ee!5567
-
Douwe Maan authored
Resolve ""Repository mirroring paused" email link is invalid" Closes #5740 See merge request gitlab-org/gitlab-ee!5546
-
Douwe Maan authored
-
Rémy Coutable authored
-
Douwe Maan authored
SamlProvider has many linked Identities See merge request gitlab-org/gitlab-ee!5507
-
Douwe Maan authored
Perform a limited count for the badge counts for tabs in the Users admin area Closes #33927 See merge request gitlab-org/gitlab-ce!18661
-
Dylan Griffith authored
-
Stan Hu authored
Update grape-entity 0.6.0 -> 0.7.1 See merge request gitlab-org/gitlab-ce!18720
-
- 03 May, 2018 16 commits
-
-
Clement Ho authored
Break issue title for board card title and issuable header text Closes #45940 See merge request gitlab-org/gitlab-ce!18674
-
Tim Zallmann authored
Add loading icon padding for pipeline environments See merge request gitlab-org/gitlab-ce!18631
-
GitLab Bot authored
# Conflicts: # LICENSE [ci skip]
-
Phil Hughes authored
Move TimeTrackingSpentOnlyPane vue component See merge request gitlab-org/gitlab-ce!18710
-
Phil Hughes authored
Move TimeTrackingSpentOnlyPane vue component See merge request gitlab-org/gitlab-ee!5559
-
Phil Hughes authored
Add padding to profile description Closes #35727 See merge request gitlab-org/gitlab-ce!18663
-
Filipa Lacerda authored
Added changes count to web IDE folder See merge request gitlab-org/gitlab-ce!18452
-
Tiago Botelho authored
Changes HTML version of mirror was hard failed email to use full path instead of relative path for the project
-
Rémy Coutable authored
Change the docs license to CC BY-SA See merge request gitlab-org/gitlab-ce!18718
-
Rémy Coutable authored
Change the docs license to CC BY-SA See merge request gitlab-org/gitlab-ee!5565
-
Rémy Coutable authored
update omniauth-github ~> 1.1.1 to ~> 1.3 See merge request gitlab-org/gitlab-ce!18668
-
James Edwards-Jones authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Pirate Praveen authored
-
Robert Speicher authored
CE upstream - 2018-05-03 13:09 UTC Closes gitaly#1146 See merge request gitlab-org/gitlab-ee!5561
-
Dylan Griffith authored
-