- 29 Mar, 2018 20 commits
-
-
Stan Hu authored
Renaming of "xlog" to "wal" for PostgreSQL 10 See merge request gitlab-org/gitlab-ee!4669
-
Brett Walker authored
-
Phil Hughes authored
Adds Vuex store for security reports See merge request gitlab-org/gitlab-ee!5155
-
Filipa Lacerda authored
* master: (171 commits) EE port of vuex-action-helper-correctly-fail Update CHANGELOG.md for 10.6.2 Update CHANGELOG-EE.md for 10.6.2-ee Fix workhorse tests Gitlab-workhorse still needs RepoPath on Git HTTP Harmonize can-attach-file to match CE Add Gitlab::ExclusiveLease to ObjectStorage#use_file Fix promoting labels and milestones copy text QA: allow rspec files/options to be handled more consistently Replaces "Libre" => "Core" Be explicit about when yellow favicon is used Use a brand-new Repository when performing Geo sync to a temporary directory Remove EE-specific comments from CE Trigger wiki sync when enabled Fixes conflicts on 'lib/gitlab/ci/config.rb' Resolve conflict in spec/spec_helper.rb Resolve "Skip repository-changing events on Geo secondaries if the repository hasn't been backfilled yet" Make all workhorse gitaly calls opt-out, take 2 Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'" Resolve application settings UI conflicts after ce-to-ee merge ...
-
Tim Zallmann authored
EE port of vuex-action-helper-correctly-fail See merge request gitlab-org/gitlab-ee!5162
-
Phil Hughes authored
-
Filipa Lacerda authored
[ci skip]
-
Filipa Lacerda authored
[ci skip]
-
Filipa Lacerda authored
-
Kamil Trzciński authored
Port of add-per-runner-job-timeout to EE See merge request gitlab-org/gitlab-ee!4649
-
Filipa Lacerda authored
-
Kamil Trzciński authored
Add Gitlab::ExclusiveLease to ObjectStorage#use_file See merge request gitlab-org/gitlab-ee!5158
-
Sean McGivern authored
CE upstream - 2018-03-28 12:06 UTC Closes #5461 See merge request gitlab-org/gitlab-ee!5145
-
Sean McGivern authored
Fix promoting labels and milestones copy text See merge request gitlab-org/gitlab-ee!4955
-
Jacob Vosmaer authored
-
Sean McGivern authored
Add canary favicon -- EE merge edition See merge request gitlab-org/gitlab-ee!5135
-
Jacob Vosmaer (GitLab) authored
-
Phil Hughes authored
Harmonize can-attach-file to match CE Closes gitlab-ce#43915 See merge request gitlab-org/gitlab-ee!5067
-
Clement Ho authored
-
Alessio Caiazza authored
-
- 28 Mar, 2018 20 commits
-
-
Marcia Ramos authored
Docs: replaces "Libre" => "Core" See merge request gitlab-org/gitlab-ee!5152
-
Stan Hu authored
-
Filipa Lacerda authored
-
Jose Ivan Vargas authored
-
Grzegorz Bizon authored
QA: allow rspec files/options to be handled more consistently See merge request gitlab-org/gitlab-ee!5144
-
Brett Walker authored
-
Stan Hu authored
Resolve "Temporary repositories in Geo sync download are broken" Closes #5485 See merge request gitlab-org/gitlab-ee!5150
-
Marcia Ramos authored
-
Rémy Coutable authored
Remove EE-specific comment markers from CE -- EE merge edition See merge request gitlab-org/gitlab-ee!5151
-
Filipa Lacerda authored
Move 'Registry' after 'CI/CD' navigation item (EE Port) See merge request gitlab-org/gitlab-ee!5142
-
Eric Eastwood authored
-
Nick Thomas authored
-
Eric Eastwood authored
Conflicts: app/views/ci/variables/_variable_row.html.haml app/views/import/github/new.html.haml app/views/projects/new.html.haml app/views/shared/_import_form.html.haml spec/javascripts/fixtures/projects.rb
-
Douwe Maan authored
Geo: Trigger wiki sync when enabled Closes #5422 See merge request gitlab-org/gitlab-ee!5139
-
Michael Kozono authored
-
Rémy Coutable authored
Move the API project import files ee/lib -> lib See merge request gitlab-org/gitlab-ee!5132
-
Stan Hu authored
-
Stan Hu authored
Improve Gitlab::Git::Checksum#calculate See merge request gitlab-org/gitlab-ee!5140
-
Stan Hu authored
-
Mayra Cabrera authored
-