- 04 Aug, 2017 7 commits
-
-
Phil Hughes authored
-
Phil Hughes authored
-
Rémy Coutable authored
Move EE-specific files to a standalone directory Closes #2902 See merge request !2483
-
Lin Jen-Shin authored
-
Filipa Lacerda authored
EE port of diff-changed-files-dropdown See merge request !2586
-
Filipa Lacerda authored
Fixed a bad conflict resolution that caused duplicated links in project sidebar See merge request !2593
-
- 03 Aug, 2017 33 commits
-
-
Phil Hughes authored
Applying CE Patch for global deferred JS loading See merge request !2569
-
Sean McGivern authored
Exclude sidekiq queues from execution in sidekiq-cluster Closes #2893 See merge request !2571
-
Lin Jen-Shin authored
* ee/master: Removed EE specific inline JS Don't include EmailHelpers manually, pick with rspec Mention EES in protected branches feature Port of fix-oauth-checkboxes to EE
-
Oswaldo Ferreira authored
-
Tim Zallmann authored
-
Tim Zallmann authored
Removed EE specific inline JS See merge request !2592
-
Rémy Coutable authored
EE: Don't include EmailHelpers manually, pick with rspec See merge request !2591
-
Lin Jen-Shin authored
-
Oswaldo Ferreira authored
-
Marcia Ramos authored
Mention EES in protected branches feature See merge request !2590
-
Phil Hughes authored
-
Phil Hughes authored
-
Oswaldo Ferreira authored
-
Filipa Lacerda authored
Port of fix-oauth-checkboxes to EE See merge request !2588
-
Oswaldo Ferreira authored
-
Lin Jen-Shin authored
-
Oswaldo Ferreira authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Lin Jen-Shin authored
* ee/master: (262 commits) Make dropdown style on project page consistent Remove :empty_project factory from spec/requests/api/merge_requests_spec.rb Fix merge conflicts Try to fix some EE protected branches specs Remove EE-specific usages of `:empty_project` Change all `:empty_project` to `:project` Remove `:empty_project` factory, implement `:repository` trait Remove documentation about `:empty_project` since we're removing it Use `:empty_project` where possible in features/steps Add filtered search to group issue dashboard (EE) Update milestone docs EE Port of 34027-add-icons-to-sidebar to EE Fix docs for using object storage for storing artifacts EE port of sidebar-fly-out-sub-nav Fix artifacts controller spec for object stores Resolve conflicts CI fixes for gitaly-ruby Fix LogCursor error message handler Add structured log messages to Geo LogCursor EE-specific changes for `:empty_project` and `:repository` ...
-
Achilleas Pipinellis authored
Fix docs for using object storage for storing artifacts See merge request !2580
-
Lin Jen-Shin authored
`:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now.
-
Achilleas Pipinellis authored
-
Annabel Dunstone Gray authored
Make dropdown style on project page consistent See merge request !2577
-
Winnie Hellmann authored
-
Phil Hughes authored
-
Rémy Coutable authored
CE upstream - Friday Closes gitaly#408, gitaly#411, and #1827 See merge request !2554
-
Nick Thomas authored
-
Filipa Lacerda authored
EE port of sidebar-fly-out-sub-nav See merge request !2576
-
Nick Thomas authored
-
Nick Thomas authored
-
Nick Thomas authored
-
Rémy Coutable authored
Add structured log messages to Geo LogCursor See merge request !2574
-