Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-04-17

Signed-off-by: Rémy Coutable <remy@rymai.me>

config/initializers/deprecations.rb

 deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
 
-if Gitlab.com? || Rails.env.development?
+if Gitlab.dev_env_or_com?
   ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator)
 end

doc/README.md

@@ -89,7 +89,7 @@ on projects and code.
 - [Snippets](user/snippets.md): Snippets allow you to create little bits of code.
 - [Wikis](user/project/wiki/index.md): Enhance your repository documentation with built-in wikis.
 - **(Premium/Ultimate)** [GitLab Service Desk](user/project/service_desk.md): A simple way to allow people to create issues in your GitLab instance without needing their own user account.
-- **(Ultimate)** [Web IDE](user/project/web_ide/index.md)
+- [Web IDE](user/project/web_ide/index.md)
 
 #### Repositories
 

doc/user/project/web_ide/index.md

 # Web IDE
 
+<<<<<<< HEAD
 > Introduced in [GitLab Ultimate][ee] 10.4.
 > Brought to [GitLab CE][ce] in 10.7.
 
 The Web IDE makes it faster and easier to contribute changes to your projects
 by providing an advanced editor with commit staging.
+=======
+> [Introduced in](https://gitlab.com/gitlab-org/gitlab-ee/issues/4539) [GitLab Ultimate][ee] 10.4.
+> [Brought to GitLab Core][core](https://gitlab.com/gitlab-org/gitlab-ce/issues/44157) in 10.7.
+
+The Web IDE editor makes it faster and easier to contribute changes to your
+projects by providing an advanced editor with commit staging.
+
+## Enable the Web IDE
+
+While in the early stages of the Beta, access to the Web IDE is by opting in.
+
+To enable the Web IDE, click on your profile image in the top right corner and
+navigate to **Settings > Preferences**, check **Enable Web IDE** and save.
+
+![Enable Web IDE](img/enable_web_ide.png)
+>>>>>>> origin/master
 
 ## Open the Web IDE
 
@@ -21,6 +38,7 @@ the 'Commit Button'.
 
 ![Commit changes](img/commit_changes.png)
 
+<<<<<<< HEAD
 ## Comparing changes
 
 Before you commit your changes, you can compare them with the previous commit
@@ -32,3 +50,6 @@ shows you a preview of the merge request diff if you commit your changes.
 
 [ee]: https://about.gitlab.com/products/
 [ce]: https://about.gitlab.com/products/
+=======
+[ee]: https://about.gitlab.com/pricing/
+>>>>>>> origin/master

lib/gitlab.rb

@@ -12,11 +12,15 @@ module Gitlab
     Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
   end
 
+  def self.org?
+    Gitlab.config.gitlab.url == 'https://dev.gitlab.org'
+  end
+
   def self.gl_subdomain?
     SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
   end
 
   def self.dev_env_or_com?
-    Rails.env.test? || Rails.env.development? || com?
+    Rails.env.test? || Rails.env.development? || org? || com?
   end
 end

spec/features/projects/files/user_uploads_files_spec.rb

@@ -7,11 +7,11 @@ describe 'Projects > Files > User uploads files' do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
   end
-  let(:project) { create(:project, :repository, name: 'Shop') }
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository, name: 'Shop', creator: user) }
   let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
   let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
   let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
-  let(:user) { project.creator }
 
   before do
     project.add_master(user)