From 3bda96215845932ea6dea9e619a94dada1a61ade Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 001/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 3 ++- app/services/files/update_service.rb | 1 + app/views/projects/blob/_editor.html.haml | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7599fec3cdf2..4c42be7d7108 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + # params[:file_name] stores the new name for the file + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 1960dc7d949c..52451d72b571 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + # Need to update file_path with the new filename repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 29c7d45074a2..3c64b2f5e96e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,7 +4,11 @@ = icon('code-fork') = ref %span.editor-file-name - = @path + - if current_action?(:edit) && can?(current_user, :push_code, @project) + = text_field_tag 'file_name', params[:file_name], placeholder: @path, + class: 'form-control new-file-name' + - else + = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From f4b38792a5c6f76b92350ef19ab53a351d01bdc4 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 002/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 6 +++++- app/services/files/base_service.rb | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd30..84b4a30c6d5e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4c42be7d7108..e76d5009855d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ def update "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 0326a8823e97..cd5b45262ac0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 0ffdb567ce893f6957f06087950c35118d5b65f6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 003/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 2 +- app/services/files/base_service.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index e76d5009855d..2bd86a1f1265 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - # params[:file_name] stores the new name for the file unless params[:file_name] == @path + previous_path = @path @path = params[:file_name] end diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index cd5b45262ac0..0326a8823e97 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From e2e588d2a8f6349208de92a8c0818d5a9178ab19 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 004/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 3 ++- app/services/files/update_service.rb | 1 + app/views/projects/blob/_editor.html.haml | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7599fec3cdf2..4c42be7d7108 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + # params[:file_name] stores the new name for the file + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 1960dc7d949c..52451d72b571 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + # Need to update file_path with the new filename repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 29c7d45074a2..3c64b2f5e96e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,7 +4,11 @@ = icon('code-fork') = ref %span.editor-file-name - = @path + - if current_action?(:edit) && can?(current_user, :push_code, @project) + = text_field_tag 'file_name', params[:file_name], placeholder: @path, + class: 'form-control new-file-name' + - else + = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From ad799589866ee0aa18a66af2fff453daaf8d9457 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 005/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 6 +++++- app/services/files/base_service.rb | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd30..84b4a30c6d5e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4c42be7d7108..e76d5009855d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ def update "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 0326a8823e97..cd5b45262ac0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From b95b23f3ed649fc58dc7dbd1ec3703d2d7f75187 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 006/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 2 +- app/services/files/base_service.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index e76d5009855d..2bd86a1f1265 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - # params[:file_name] stores the new name for the file unless params[:file_name] == @path + previous_path = @path @path = params[:file_name] end diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index cd5b45262ac0..0326a8823e97 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 6b836637235a36e6fe3b6b4911064cc3421a231a Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 007/183] creates the update_file method in repository.rb and applies changes accordingly --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 2 +- app/models/repository.rb | 30 +++++++++++++++++++++ app/services/files/base_service.rb | 1 + app/services/files/update_service.rb | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 84b4a30c6d5e..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path + file_path: @path, + previous_path: @previous_path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2bd86a1f1265..1e96f4714835 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,7 @@ def update "#file-path-#{hexdigest(@path)}" else unless params[:file_name] == @path - previous_path = @path + @previous_path = @path @path = params[:file_name] end diff --git a/app/models/repository.rb b/app/models/repository.rb index 078ca8f4e136..a5fb13eb662c 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,6 +741,36 @@ def commit_file(user, path, content, message, branch, update) end end + def update_file(user, path, previous_path, content, message, branch, update) + commit_with_hooks(user, branch) do |ref| + committer = user_to_committer(user) + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + + options[:file] = { + content: content, + path: path, + update: update + } + + Gitlab::Git::Blob.commit(raw_repository, options) + end + end + def remove_file(user, path, message, branch) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 0326a8823e97..29bd450bb98b 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -9,6 +9,7 @@ def execute @commit_message = params[:commit_message] @file_path = params[:file_path] + @previous_path = params[:previous_path] @file_content = if params[:file_content_encoding] == 'base64' Base64.decode64(params[:file_content]) else diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 52451d72b571..6d015642b910 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,7 +4,7 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end end -- GitLab From 85d1a9708ea31084147911243be248a02e89c56a Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 008/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 3 ++- app/services/files/update_service.rb | 1 + app/views/projects/blob/_editor.html.haml | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7599fec3cdf2..4c42be7d7108 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + # params[:file_name] stores the new name for the file + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 1960dc7d949c..52451d72b571 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + # Need to update file_path with the new filename repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 29c7d45074a2..3c64b2f5e96e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,7 +4,11 @@ = icon('code-fork') = ref %span.editor-file-name - = @path + - if current_action?(:edit) && can?(current_user, :push_code, @project) + = text_field_tag 'file_name', params[:file_name], placeholder: @path, + class: 'form-control new-file-name' + - else + = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From dd161e155d7bb2632a522db1c89c352b8374cead Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 009/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 6 +++++- app/services/files/base_service.rb | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd30..84b4a30c6d5e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4c42be7d7108..e76d5009855d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ def update "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 0326a8823e97..cd5b45262ac0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 6b474d404627b20c86555586d56f0cc3b99845dd Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 010/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 2 +- app/services/files/base_service.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index e76d5009855d..2bd86a1f1265 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - # params[:file_name] stores the new name for the file unless params[:file_name] == @path + previous_path = @path @path = params[:file_name] end diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index cd5b45262ac0..0326a8823e97 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 3e97068c64034a29bbf1e33948a56f67cf6635a1 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 011/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 17 +++++++---- app/controllers/concerns/creates_commit.rb | 8 +++++ app/controllers/projects/blob_controller.rb | 4 +-- app/models/repository.rb | 33 +++++++++++++++++++++ app/services/files/update_service.rb | 5 +++- 6 files changed, 59 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index e409e66aab07..0ba6bbdb4b1f 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2' +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 35c3770d42ce..4e976370de4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +PATH + remote: ~/src/Gitlab/gitlab_git + specs: + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + GEM remote: https://rubygems.org/ specs: @@ -276,11 +285,6 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -391,6 +395,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -863,7 +868,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_emoji (~> 0.3.0) - gitlab_git (~> 10.2) + gitlab_git (~> 10.2)! gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 84b4a30c6d5e..dc1571211063 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -11,8 +11,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ file_path: @path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2bd86a1f1265..e2ddda1474b3 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name] == @path - previous_path = @path + unless params[:file_name].empty? + @previous_path = @path @path = params[:file_name] end diff --git a/app/models/repository.rb b/app/models/repository.rb index 078ca8f4e136..75071c65efbd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,6 +741,39 @@ def commit_file(user, path, content, message, branch, update) end end + def update_file(user, path, previous_path, content, message, branch, update) + commit_with_hooks(user, branch) do |ref| + committer = user_to_committer(user) + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, + branch: ref + } + + options[:file] = { + content: content, + path: path, + update: update + } + + if previous_path + options[:file].merge!(previous_path: previous_path) + + puts "#" * 90 + puts "Hello" + puts "#" * 90 + Gitlab::Git::Blob.rename(raw_repository, options) + else + puts "#" * 90 + puts "World" + puts "#" * 90 + Gitlab::Git::Blob.commit(raw_repository, options) + end + end + end + def remove_file(user, path, message, branch) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 52451d72b571..7b7bce206625 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,7 +4,10 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end end -- GitLab From c5630fbf979dfe6b412d2deb8e98480d2c912a63 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 012/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 0326a8823e97..cd5b45262ac0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 013/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index cd5b45262ac0..0326a8823e97 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 08c15116d197ff1267e0cc1c1403af65e8b41772 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 014/183] creates the update_file method in repository.rb and applies changes accordingly --- app/controllers/concerns/creates_commit.rb | 3 ++- app/models/repository.rb | 16 ++++++++++++++++ app/services/files/base_service.rb | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dc1571211063..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path + file_path: @path, + previous_path: @previous_path ) puts "#" * 10 diff --git a/app/models/repository.rb b/app/models/repository.rb index 75071c65efbd..37455e673282 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -749,15 +749,31 @@ def update_file(user, path, previous_path, content, message, branch, update) options[:author] = committer options[:commit] = { message: message, +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 branch: ref } +======= + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + +>>>>>>> creates the update_file method in repository.rb and applies changes accordingly options[:file] = { content: content, path: path, update: update } +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if previous_path options[:file].merge!(previous_path: previous_path) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 0326a8823e97..29bd450bb98b 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -9,6 +9,7 @@ def execute @commit_message = params[:commit_message] @file_path = params[:file_path] + @previous_path = params[:previous_path] @file_content = if params[:file_content_encoding] == 'base64' Base64.decode64(params[:file_content]) else -- GitLab From f30d2b7153e135b30135af06848ca4bfa20007bb Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 015/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- app/controllers/concerns/creates_commit.rb | 8 -------- app/models/repository.rb | 6 ------ app/services/files/update_service.rb | 3 --- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 0ba6bbdb4b1f..5ea2c8c17e09 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 4e976370de4a..6d9c96272022 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -395,7 +397,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/models/repository.rb b/app/models/repository.rb index 75071c65efbd..bf45f48e61a0 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -761,14 +761,8 @@ def update_file(user, path, previous_path, content, message, branch, update) if previous_path options[:file].merge!(previous_path: previous_path) - puts "#" * 90 - puts "Hello" - puts "#" * 90 Gitlab::Git::Blob.rename(raw_repository, options) else - puts "#" * 90 - puts "World" - puts "#" * 90 Gitlab::Git::Blob.commit(raw_repository, options) end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 7b7bce206625..6d015642b910 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,9 +4,6 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - puts "#" * 10 - puts @previous_path - puts "#" * 10 repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end -- GitLab From a00d574ae921c2a9c1f694c1bf496d8ec28b9e23 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:07:16 +0100 Subject: [PATCH 016/183] adds change to CHANGELOG file --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 5b91ee1159c5..2c54710be5db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.10.0 (unreleased) + - Add the functionality to be able to rename a file. !5049 (tiagonbotelho) - Fix commit builds API, return all builds for all pipelines for given commit. !4849 - Replace Haml with Hamlit to make view rendering faster. !3666 - Refactor repository paths handling to allow multiple git mount points -- GitLab From 0173b65d2605a6c332152fae2e53e84ba26a0df2 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 017/183] refactors to pass values as arguments through options --- app/models/repository.rb | 25 +++++++++++++------------ app/services/files/update_service.rb | 4 +++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index bf45f48e61a0..38ef1b2c57b8 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,29 +741,30 @@ def commit_file(user, path, content, message, branch, update) end end - def update_file(user, path, previous_path, content, message, branch, update) + # previous_path, message, update + def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - options = {} - options[:committer] = committer - options[:author] = committer - options[:commit] = { - message: message, + commit_options = {} + commit_options[:committer] = committer + commit_options[:author] = committer + commit_options[:commit] = { + message: options[:message], branch: ref } - options[:file] = { + commit_options[:file] = { content: content, path: path, - update: update + update: options[:update] } - if previous_path - options[:file].merge!(previous_path: previous_path) + if options[:previous_path] + commit_options[:file].merge!(previous_path: options[:previous_path]) - Gitlab::Git::Blob.rename(raw_repository, options) + Gitlab::Git::Blob.rename(raw_repository, commit_options) else - Gitlab::Git::Blob.commit(raw_repository, options) + Gitlab::Git::Blob.commit(raw_repository, commit_options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 6d015642b910..7835d7eba44b 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,7 +4,9 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @file_content, + @target_branch, previous_path: @previous_path, + message: @commit_message, update: true) end end end -- GitLab From c98369207917e83d445fe94a350a9fba7f17fd0c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:28:50 +0100 Subject: [PATCH 018/183] removes redundant comment --- app/services/files/update_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 7835d7eba44b..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,6 @@ module Files class UpdateService < Files::BaseService def commit - # Need to update file_path with the new filename repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) -- GitLab From 8840dcf679bf40c70e2fb0f1d6823b8138d3fe20 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 019/183] fixes issues for mr acceptance --- app/models/repository.rb | 2 +- app/views/projects/blob/_editor.html.haml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 38ef1b2c57b8..ea7355b3c089 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -760,7 +760,7 @@ def update_file(user, path, content, branch, options={}) } if options[:previous_path] - commit_options[:file].merge!(previous_path: options[:previous_path]) + commit_options[:file][:previous_path] = options[:previous_path] Gitlab::Git::Blob.rename(raw_repository, commit_options) else diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 3c64b2f5e96e..31bd4646d3dd 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,11 +4,9 @@ = icon('code-fork') = ref %span.editor-file-name - - if current_action?(:edit) && can?(current_user, :push_code, @project) - = text_field_tag 'file_name', params[:file_name], placeholder: @path, + -if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] or @path), class: 'form-control new-file-name' - - else - = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 7f4959ee4f8d54b42c394db1cfb32929cece419f Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 020/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 3 ++- app/services/files/update_service.rb | 1 + app/views/projects/blob/_editor.html.haml | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7599fec3cdf2..4c42be7d7108 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + # params[:file_name] stores the new name for the file + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 1960dc7d949c..52451d72b571 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + # Need to update file_path with the new filename repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 29c7d45074a2..3c64b2f5e96e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,7 +4,11 @@ = icon('code-fork') = ref %span.editor-file-name - = @path + - if current_action?(:edit) && can?(current_user, :push_code, @project) + = text_field_tag 'file_name', params[:file_name], placeholder: @path, + class: 'form-control new-file-name' + - else + = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 405675117a3bc9a5d2e70890a90b73895d065bae Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 021/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 6 +++++- app/services/files/base_service.rb | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd30..84b4a30c6d5e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4c42be7d7108..e76d5009855d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ def update "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 4bdb68a3698f..def64dabf114 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From ef0f4950af1eb994eaa3ed6f2bfea37e6eff7ce1 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 022/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 2 +- app/services/files/base_service.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index e76d5009855d..2bd86a1f1265 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - # params[:file_name] stores the new name for the file unless params[:file_name] == @path + previous_path = @path @path = params[:file_name] end diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index def64dabf114..4bdb68a3698f 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 75e961dc7f51c169c65a9b525a111c4d0713f9a7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 023/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2bd86a1f1265..e2ddda1474b3 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name] == @path - previous_path = @path + unless params[:file_name].empty? + @previous_path = @path @path = params[:file_name] end -- GitLab From 7f62a7b8965273a4d826647e76c97a05f9a4b3ad Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 024/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 4bdb68a3698f..def64dabf114 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 09c77952430cb5dd19baa4b29f9dc8f50a5b60cb Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 025/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index def64dabf114..4bdb68a3698f 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 143fa8e7ca9d4c16f5008d2fe123886578bb0015 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 026/183] creates the update_file method in repository.rb and applies changes accordingly --- app/controllers/concerns/creates_commit.rb | 3 ++- app/models/repository.rb | 30 ++++++++++++++++++++++ app/services/files/base_service.rb | 1 + app/services/files/update_service.rb | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 84b4a30c6d5e..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path + file_path: @path, + previous_path: @previous_path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/models/repository.rb b/app/models/repository.rb index 078ca8f4e136..a5fb13eb662c 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,6 +741,36 @@ def commit_file(user, path, content, message, branch, update) end end + def update_file(user, path, previous_path, content, message, branch, update) + commit_with_hooks(user, branch) do |ref| + committer = user_to_committer(user) + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + + options[:file] = { + content: content, + path: path, + update: update + } + + Gitlab::Git::Blob.commit(raw_repository, options) + end + end + def remove_file(user, path, message, branch) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 4bdb68a3698f..6e46bcea24c0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -9,6 +9,7 @@ def execute @commit_message = params[:commit_message] @file_path = params[:file_path] + @previous_path = params[:previous_path] @file_content = if params[:file_content_encoding] == 'base64' Base64.decode64(params[:file_content]) else diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 52451d72b571..6d015642b910 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,7 +4,7 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end end -- GitLab From 032a325e0075bbda173d151a0f0c56d0dc6957df Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 027/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 6d015642b910..fefa1d4ef68f 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,6 @@ module Files class UpdateService < Files::BaseService def commit - # Need to update file_path with the new filename repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end -- GitLab From 01e041a6fd63bdbefe84498c9eeef3455762a7ff Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 028/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 6e46bcea24c0..04bab96869ca 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 2da08236773692ac819a6acde0dfab8d26a26e30 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 029/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 04bab96869ca..6e46bcea24c0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 0a6aedc9db8077147b05ac75f79b1507280ba6e1 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 030/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++++++++++++ app/controllers/concerns/creates_commit.rb | 8 ++++++++ app/models/repository.rb | 19 ++++++++----------- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 99ca6608a6f2..9eaffc4a94ba 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2' +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index af8fbedc1270..96bb7b2e3d53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +PATH + remote: ~/src/Gitlab/gitlab_git + specs: + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + GEM remote: https://rubygems.org/ specs: @@ -274,11 +283,16 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) +======= + gitlab_emoji (0.3.1) + gemojione (~> 2.2, >= 2.2.1) +>>>>>>> refactors blob_controller gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -389,6 +403,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -861,7 +876,12 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (~> 10.2) +======= + gitlab_emoji (~> 0.3.0) + gitlab_git (~> 10.2)! +>>>>>>> refactors blob_controller gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/models/repository.rb b/app/models/repository.rb index a5fb13eb662c..bf45f48e61a0 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -749,25 +749,22 @@ def update_file(user, path, previous_path, content, message, branch, update) options[:author] = committer options[:commit] = { message: message, - branch: ref, + branch: ref } - if previous_path - options[:file] = { - path: previous_path - } - - - Gitlab::Git::Blob.remove(raw_repository, options) - end - options[:file] = { content: content, path: path, update: update } - Gitlab::Git::Blob.commit(raw_repository, options) + if previous_path + options[:file].merge!(previous_path: previous_path) + + Gitlab::Git::Blob.rename(raw_repository, options) + else + Gitlab::Git::Blob.commit(raw_repository, options) + end end end -- GitLab From 632b360613b72e76c682d4ee20135aae6b3dea25 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 031/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 6e46bcea24c0..04bab96869ca 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From a01facc81ff9ebf6eb25c66cc9d4b7312be9cf27 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 032/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 04bab96869ca..6e46bcea24c0 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From c71254ffd440b6b20b0a9b796d33a0bb5d33de97 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 033/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/models/repository.rb b/app/models/repository.rb index bf45f48e61a0..0e4b85bd5ffd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -749,15 +749,31 @@ def update_file(user, path, previous_path, content, message, branch, update) options[:author] = committer options[:commit] = { message: message, +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 branch: ref } +======= + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + +>>>>>>> creates the update_file method in repository.rb and applies changes accordingly options[:file] = { content: content, path: path, update: update } +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if previous_path options[:file].merge!(previous_path: previous_path) -- GitLab From 519e95133a81a68df53114f796b91d96f60c1bbb Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 034/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- app/controllers/concerns/creates_commit.rb | 8 -------- app/models/repository.rb | 16 ---------------- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/Gemfile b/Gemfile index 9eaffc4a94ba..37c5c021bebe 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 96bb7b2e3d53..51258219628a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -403,7 +405,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/models/repository.rb b/app/models/repository.rb index 0e4b85bd5ffd..16988f6df3dd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -749,31 +749,15 @@ def update_file(user, path, previous_path, content, message, branch, update) options[:author] = committer options[:commit] = { message: message, -<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 - branch: ref - } - -======= branch: ref, } - if previous_path - options[:file] = { - path: previous_path - } - - - Gitlab::Git::Blob.remove(raw_repository, options) - end - ->>>>>>> creates the update_file method in repository.rb and applies changes accordingly options[:file] = { content: content, path: path, update: update } -<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if previous_path options[:file].merge!(previous_path: previous_path) -- GitLab From c1c11fa7725443b6c00a45eac0e8ffc986b19a45 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:07:16 +0100 Subject: [PATCH 035/183] adds change to CHANGELOG file --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 8ef934bf80d3..6c2b02688dbb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.10.0 (unreleased) + - Add the functionality to be able to rename a file. !5049 (tiagonbotelho) - Fix commit builds API, return all builds for all pipelines for given commit. !4849 - Replace Haml with Hamlit to make view rendering faster. !3666 - Refactor repository paths handling to allow multiple git mount points -- GitLab From 8df419cba35262b827b6d04870da1df3ed79b939 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 036/183] refactors to pass values as arguments through options --- app/models/repository.rb | 27 ++++++++++++++------------- app/services/files/update_service.rb | 4 +++- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 16988f6df3dd..58ceed6aa3d2 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,29 +741,30 @@ def commit_file(user, path, content, message, branch, update) end end - def update_file(user, path, previous_path, content, message, branch, update) + # previous_path, message, update + def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - options = {} - options[:committer] = committer - options[:author] = committer - options[:commit] = { - message: message, - branch: ref, + commit_options = {} + commit_options[:committer] = committer + commit_options[:author] = committer + commit_options[:commit] = { + message: options[:message], + branch: ref } - options[:file] = { + commit_options[:file] = { content: content, path: path, - update: update + update: options[:update] } - if previous_path - options[:file].merge!(previous_path: previous_path) + if commit_options[:previous_path] + commit_options[:file].merge!(previous_path: commit_options[:previous_path]) - Gitlab::Git::Blob.rename(raw_repository, options) + Gitlab::Git::Blob.rename(raw_repository, commit_options) else - Gitlab::Git::Blob.commit(raw_repository, options) + Gitlab::Git::Blob.commit(raw_repository, commit_options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index fefa1d4ef68f..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,9 @@ module Files class UpdateService < Files::BaseService def commit - repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @file_content, + @target_branch, previous_path: @previous_path, + message: @commit_message, update: true) end end end -- GitLab From 510558fbb8b736c0903059bd19f2f095024cabd0 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 037/183] fixes issues for mr acceptance --- app/models/repository.rb | 4 ++-- app/views/projects/blob/_editor.html.haml | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 58ceed6aa3d2..ea7355b3c089 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -759,8 +759,8 @@ def update_file(user, path, content, branch, options={}) update: options[:update] } - if commit_options[:previous_path] - commit_options[:file].merge!(previous_path: commit_options[:previous_path]) + if options[:previous_path] + commit_options[:file][:previous_path] = options[:previous_path] Gitlab::Git::Blob.rename(raw_repository, commit_options) else diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 3c64b2f5e96e..31bd4646d3dd 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,11 +4,9 @@ = icon('code-fork') = ref %span.editor-file-name - - if current_action?(:edit) && can?(current_user, :push_code, @project) - = text_field_tag 'file_name', params[:file_name], placeholder: @path, + -if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] or @path), class: 'form-control new-file-name' - - else - = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 2472a0c7dcce4aeda1ccfa71d82641dbc3600f58 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 14:35:56 +0100 Subject: [PATCH 038/183] fixes merge conflicts for Gemfile.lock --- Gemfile.lock | 179 ++++++++++++++++++++++++--------------------------- 1 file changed, 85 insertions(+), 94 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 51258219628a..5c800b2ec5bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + revision: cfb423fb576590525c4a978bc21cc98917c3334c branch: commit-blob-rename-action specs: gitlab_git (10.3.0) @@ -68,14 +68,13 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - ast (2.2.0) + asciidoctor (1.5.4) + ast (2.3.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -99,7 +98,7 @@ GEM babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) - benchmark-ips (2.3.0) + benchmark-ips (2.6.1) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -111,13 +110,13 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.0.0) + bullet (5.1.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.9.0) + uniform_notifier (~> 1.10.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.5) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -125,7 +124,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.13) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -137,9 +136,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.6) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -149,15 +148,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.7.7) + colorize (0.8.1) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.1) + css_parser (1.4.5) addressable - d3_rails (3.5.11) + d3_rails (3.5.16) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -167,7 +166,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -184,7 +183,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.3) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -194,9 +193,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.0.8) - excon (0.49.0) - execjs (2.6.0) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -211,18 +210,21 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.10) - flay (2.6.1) + ffi (1.9.12) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.3.2) + flog (4.4.0) + path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.9.4) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -231,7 +233,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -244,8 +246,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.6) - fog-core (>= 1.39) + fog-openstack (0.1.7) + fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -256,9 +258,9 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.1.0) + font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.82.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.0.0) @@ -268,7 +270,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.0) + get_process_mem (0.2.1) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -285,16 +287,6 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) -======= - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) ->>>>>>> refactors blob_controller gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -303,7 +295,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.0) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -337,10 +329,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.3) + hashie (3.4.4) health_check (1.5.1) rails (>= 2.3.0) - hipchat (1.5.2) + hipchat (1.5.3) httparty mimemagic html-pipeline (1.11.0) @@ -351,10 +343,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.7.0.1) + httpclient (2.8.0) i18n (0.7.0) - ice_nine (0.11.1) - influxdb (0.2.3) + ice_nine (0.11.2) + influxdb (0.3.5) cause json ipaddress (0.8.3) @@ -369,12 +361,12 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - jwt (1.5.2) + jwt (1.5.4) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.11.1) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -385,7 +377,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (2.1.2) bundler httparty rubyzip @@ -393,9 +385,10 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -405,23 +398,24 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mime-types-data (3.2016.0521) + mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.11.2) + multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.3.21) nested_form (0.3.2) - net-ldap (0.12.1) - net-ssh (3.0.1) - newrelic_rpm (3.14.1.311) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -433,7 +427,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) + omniauth-auth0 (1.4.2) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -452,7 +446,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.2.10) @@ -487,10 +481,11 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) + paranoia (2.1.5) activerecord (~> 4.0) - parser (2.3.1.0) + parser (2.3.1.2) ast (~> 2.2) + path_expander (1.0.0) pg (0.18.4) pkg-config (1.1.7) poltergeist (1.9.0) @@ -500,10 +495,10 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.8.7) + css_parser (>= 1.4.5) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) + premailer-rails (1.9.4) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.3) @@ -521,7 +516,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.1) + rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -556,19 +551,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.16.0) rake (10.5.0) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.0.0) + recaptcha (3.3.0) json - redcarpet (3.3.3) - redis (3.2.2) + redcarpet (3.3.4) + redis (3.3.0) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -587,16 +582,16 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.0) + request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.0) - rqrcode (0.7.0) - chunky_png + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) @@ -635,12 +630,13 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.3.0) nokogiri (>= 1.5.10) + ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.5.2) + rubyntlm (0.6.0) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.1.10) + rufus-scheduler (3.2.1) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -664,7 +660,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -679,7 +675,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -713,7 +709,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -774,7 +770,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) unicorn (4.9.0) kgio (~> 2.6) rack @@ -782,7 +778,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.9.0) + uniform_notifier (1.10.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -802,7 +798,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -877,12 +873,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 - gitlab_git (~> 10.2) -======= - gitlab_emoji (~> 0.3.0) gitlab_git (~> 10.2)! ->>>>>>> refactors blob_controller gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) @@ -1007,4 +998,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.10.6 -- GitLab From d6664a2b1ea06d1db84e1ad69bb67b58a91abe87 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:36:22 +0100 Subject: [PATCH 039/183] fixes merge request edit bug where it would generate a cloned file and not remove the previous one --- Gemfile.lock | 1 - app/controllers/projects/blob_controller.rb | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c800b2ec5bb..e0c052fdc579 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -398,7 +398,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index e2ddda1474b3..6d3a7fde101b 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,16 +38,16 @@ def edit end def update + unless params[:file_name].empty? + @previous_path = @path + @path = params[:file_name] + end + after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name].empty? - @previous_path = @path - @path = params[:file_name] - end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From 59a2e17994da6988023758b572f82789af3f90dd Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:51:02 +0100 Subject: [PATCH 040/183] fixes more issues for MR acceptance --- app/models/repository.rb | 24 +++++++++++------------ app/services/files/update_service.rb | 5 +++-- app/views/projects/blob/_editor.html.haml | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index ea7355b3c089..1aba6ec17b4a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -742,29 +742,29 @@ def commit_file(user, path, content, message, branch, update) end # previous_path, message, update - def update_file(user, path, content, branch, options={}) + def update_file(user, path, content, branch:, previous_path:, message:) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - commit_options = {} - commit_options[:committer] = committer - commit_options[:author] = committer - commit_options[:commit] = { - message: options[:message], + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, branch: ref } - commit_options[:file] = { + options[:file] = { content: content, path: path, - update: options[:update] + update: true } - if options[:previous_path] - commit_options[:file][:previous_path] = options[:previous_path] + if previous_path + options[:file][:previous_path] = previous_path - Gitlab::Git::Blob.rename(raw_repository, commit_options) + Gitlab::Git::Blob.rename(raw_repository, options) else - Gitlab::Git::Blob.commit(raw_repository, commit_options) + Gitlab::Git::Blob.commit(raw_repository, options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 905c7a7c81ae..8d2b5083179e 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,8 +4,9 @@ module Files class UpdateService < Files::BaseService def commit repository.update_file(current_user, @file_path, @file_content, - @target_branch, previous_path: @previous_path, - message: @commit_message, update: true) + branch: @target_branch, + previous_path: @previous_path, + message: @commit_message) end end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 31bd4646d3dd..ad3009f30ab7 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,8 +4,8 @@ = icon('code-fork') = ref %span.editor-file-name - -if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] or @path), + - if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] || @path), class: 'form-control new-file-name' - if current_action?(:new) || current_action?(:create) -- GitLab From 72feec8148cbb8afdc10d07b4fe231d8fb2ebbf2 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:04 +0100 Subject: [PATCH 041/183] removes the git path for the gitlab_git gem corresponding to this MR dependency --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 37c5c021bebe..99ca6608a6f2 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +gem "gitlab_git", '~> 10.2' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes -- GitLab From fb2a663e3bc6cf8f9d76127e54c8266bbe2ff1be Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:33 +0100 Subject: [PATCH 042/183] removes Gemfile.lock --- Gemfile.lock | 1000 -------------------------------------------------- 1 file changed, 1000 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index e0c052fdc579..000000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,1000 +0,0 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: cfb423fb576590525c4a978bc21cc98917c3334c - branch: commit-blob-rename-action - specs: - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - better_errors (1.0.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) - ffi (1.9.12) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) - oauth (0.5.1) - oauth2 (1.0.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (~> 1.2) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet - bundler-audit - byebug - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay - flog - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.2)! - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 1.5.1) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack - letter_opener_web (~> 1.3.0) - license_finder - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.0.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.6 -- GitLab From 56e62df5d1631996ebe9b7fef4a078a9548c577f Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 10:40:10 +0100 Subject: [PATCH 043/183] adds Gemfile.lock to mr --- Gemfile.lock | 994 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 994 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..8809edb0fc98 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,994 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.3.0) + activerecord (>= 3.0) + akismet (2.0.0) + allocations (1.0.5) + arel (6.0.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.4) + ast (2.3.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) + execjs + awesome_print (1.2.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) + babosa (1.0.2) + base32 (0.3.2) + bcrypt (3.1.11) + benchmark-ips (2.6.1) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + brakeman (3.3.2) + browser (2.2.0) + builder (3.2.2) + bullet (5.1.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (9.0.5) + capybara (2.6.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.13) + capybara (>= 1.0, < 3) + launchy + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.6) + cliver (0.3.2) + coderay (1.1.1) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorize (0.8.1) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + creole (0.5.0) + css_parser (1.4.5) + addressable + d3_rails (3.5.16) + railties (>= 3.1.0) + daemons (1.2.3) + database_cleaner (1.4.1) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + default_value_for (3.0.1) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.2.5) + diffy (3.0.7) + docile (1.1.5) + doorkeeper (4.0.0) + railties (>= 4.2) + dropzonejs-rails (0.7.3) + rails (> 3.1) + email_reply_parser (0.5.8) + email_spec (1.6.0) + launchy (~> 2.1) + mail (~> 2.2) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) + expression_parser (0.9.0) + factory_girl (4.5.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) + railties (>= 3.0.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + ffaker (2.0.0) + ffi (1.9.13) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) + ruby_parser (~> 3.0) + sexp_processor (~> 4.0) + flog (4.4.0) + path_expander (~> 1.0) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aws (0.9.4) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.42.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-google (0.3.2) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.0) + fog-core (~> 1.27) + fog-openstack (0.1.7) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.6.3.1) + railties (>= 3.2, < 5.1) + foreman (0.82.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.6.1) + json + get_process_mem (0.2.1) + gherkin-ruby (0.3.2) + github-linguist (4.7.6) + charlock_holmes (~> 0.7.3) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.23.0b) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grit (2.8.1) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16, < 3) + posix-spawn (~> 0.3) + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.3) + globalid (0.3.6) + activesupport (>= 4.1.0) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) + gon (6.0.1) + actionpack (>= 3.0) + json + multi_json + request_store (>= 1.0) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + hamlit (2.5.0) + temple (~> 0.7.6) + thor + tilt + hashie (3.4.4) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.3) + httparty + mimemagic + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + htmlentities (4.3.4) + http_parser.rb (0.5.3) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.8.0) + i18n (0.7.0) + ice_nine (0.11.2) + influxdb (0.3.5) + cause + json + ipaddress (0.8.3) + jquery-atwho-rails (1.3.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + jwt (1.5.4) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.10.0) + knapsack (1.11.1) + rake + timecop (>= 0.1.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.2) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.1) + mini_portile2 (2.1.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + mysql2 (0.3.21) + nested_form (0.3.2) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + numerizer (0.1.1) + oauth (0.5.1) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (~> 1.2) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-auth0 (1.4.2) + omniauth-oauth2 (~> 1.1) + omniauth-azure-oauth2 (0.0.6) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-cas3 (1.1.3) + addressable (~> 2.3) + nokogiri (~> 1.6.6) + omniauth (~> 1.2) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-gitlab (1.0.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) + omniauth-shibboleth (1.2.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + paranoia (2.1.5) + activerecord (~> 4.0) + parser (2.3.1.2) + ast (~> 2.2) + path_expander (1.0.0) + pg (0.18.4) + pkg-config (1.1.7) + poltergeist (1.9.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + powerpack (0.1.1) + premailer (1.8.7) + css_parser (>= 1.4.5) + htmlentities (>= 4.0.0) + premailer-rails (1.9.4) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.3.1) + rack + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-oauth2 (1.2.3) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (2.1.0) + raindrops (0.16.0) + rake (10.5.0) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rdoc (3.12.2) + json (~> 1.4) + recaptcha (3.3.0) + json + redcarpet (3.3.4) + redis (3.3.0) + redis-actionpack (4.0.1) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.1.5) + activesupport (>= 3, < 5) + redis-store (~> 1.1.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.7) + redis (>= 2.2) + request_store (1.3.1) + rerun (0.11.0) + listen (~> 3.0) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) + nokogiri (>= 1.5.10) + ruby_dep (1.3.1) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) + rubyntlm (0.6.0) + rubypants (0.2.0) + rubyzip (1.2.0) + rufus-scheduler (3.2.1) + rugged (0.24.0) + safe_yaml (1.0.4) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.10) + thor (~> 0.14) + sentry-raven (1.1.0) + faraday (>= 0.7.6) + settingslogic (2.0.9) + sexp_processor (4.7.0) + sham_rack (1.3.6) + rack + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + sidekiq (4.1.4) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) + sidekiq-cron (0.4.2) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.0.0) + simple_oauth (0.1.9) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + six (0.2.0) + slack-notifier (1.2.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + spring-commands-spinach (1.1.0) + spring (>= 0.9.1) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) + state_machines-activemodel (>= 0.3.0) + stringex (2.5.2) + sys-filesystem (1.1.6) + ffi + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.7.7) + test_after_commit (0.4.2) + activerecord (>= 3.2) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) + twitter-stream (~> 0.1) + turbolinks (2.5.3) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + u2f (0.2.1) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.1.0) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.10.0) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.1.0) + warden (1.2.6) + rack (>= 1.0) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + wikicloth (0.8.1) + builder + expression_parser + rinku + xml-simple (1.1.5) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-session_store (~> 1.0.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + akismet (~> 2.0) + allocations (~> 1.0) + asana (~> 0.4.0) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 3.0.0) + awesome_print (~> 1.2.0) + babosa (~> 1.0.2) + base32 (~> 0.3.0) + benchmark-ips + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) + bootstrap-sass (~> 3.3.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet + bundler-audit + byebug + capybara (~> 2.6.2) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.10.0) + charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) + coffee-rails (~> 4.1.0) + connection_pool (~> 2.0) + creole (~> 0.5.0) + d3_rails (~> 3.5.0) + database_cleaner (~> 1.4.0) + default_value_for (~> 3.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) + diffy (~> 3.0.3) + doorkeeper (~> 4.0) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + factory_girl_rails (~> 4.6.0) + ffaker (~> 2.0.0) + flay + flog + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman + fuubar (~> 2.0.0) + gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) + github-linguist (~> 4.7.0) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab_git (~> 10.2) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.1.0) + gollum-rugged_adapter (~> 0.4.2) + gon (~> 6.0.1) + grape (~> 0.13.0) + grape-entity (~> 0.4.2) + hamlit (~> 2.5) + health_check (~> 1.5.1) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + influxdb (~> 0.2) + jquery-atwho-rails (~> 1.3.2) + jquery-rails (~> 4.1.0) + jquery-turbolinks (~> 2.1.0) + jquery-ui-rails (~> 5.0.0) + jwt + kaminari (~> 0.17.0) + knapsack + letter_opener_web (~> 1.3.0) + license_finder + licensee (~> 8.0.0) + loofah (~> 2.0.3) + mail_room (~> 0.8) + method_source (~> 0.8) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) + oauth2 (~> 1.0.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) + omniauth-azure-oauth2 (~> 0.0.6) + omniauth-bitbucket (~> 0.0.2) + omniauth-cas3 (~> 1.1.2) + omniauth-facebook (~> 3.0.0) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.0) + omniauth-kerberos (~> 0.3.0) + omniauth-saml (~> 1.6.0) + omniauth-shibboleth (~> 1.2.0) + omniauth-twitter (~> 1.2.0) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails + rack-attack (~> 4.3.1) + rack-cors (~> 0.4.0) + rack-oauth2 (~> 1.2.1) + rails (= 4.2.6) + rails-deprecated_sanitizer (~> 1.0.3) + rainbow (~> 2.1.0) + rblineprof + rdoc (~> 3.6) + recaptcha (~> 3.0) + redcarpet (~> 3.3.3) + redis (~> 3.2) + redis-namespace + redis-rails (~> 4.0.0) + request_store (~> 1.3.0) + rerun (~> 0.11.0) + responders (~> 2.0) + rouge (~> 1.11) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.5.0) + rspec-retry + rubocop (~> 0.40.0) + rubocop-rspec (~> 1.5.0) + ruby-fogbugz (~> 0.2.1) + sanitize (~> 2.0) + sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + sentry-raven (~> 1.1.0) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (~> 4.0) + sidekiq-cron (~> 0.4.0) + simplecov (~> 0.11.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.2.0) + spinach-rails (~> 0.2.1) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.1.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) + task_list (~> 1.0.2) + teaspoon (~> 1.1.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.4.2) + thin (~> 1.7.0) + tinder (~> 1.10.0) + turbolinks (~> 2.5.0) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + underscore-rails (~> 1.8.0) + unf (~> 0.1.4) + unicorn (~> 4.9.0) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + vmstat (~> 2.1.0) + web-console (~> 2.0) + webmock (~> 1.21.0) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.12.5 -- GitLab From fe40a148fe9608dc9e0c0133f4a3e768ab53e1bf Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 044/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 3 ++- app/services/files/update_service.rb | 1 + app/views/projects/blob/_editor.html.haml | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 5356fdf010df..bcd436f2429a 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + # params[:file_name] stores the new name for the file + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 1960dc7d949c..52451d72b571 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + # Need to update file_path with the new filename repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 29c7d45074a2..3c64b2f5e96e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,7 +4,11 @@ = icon('code-fork') = ref %span.editor-file-name - = @path + - if current_action?(:edit) && can?(current_user, :push_code, @project) + = text_field_tag 'file_name', params[:file_name], placeholder: @path, + class: 'form-control new-file-name' + - else + = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 298abfd3b488c9c783ea59ef57e769da009af125 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 045/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 6 +++++- app/services/files/base_service.rb | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd30..84b4a30c6d5e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index bcd436f2429a..116f184c2404 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ def update "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 37c5e321b39e..ac5d7ddde022 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,7 @@ def execute params[:file_content] end + # Validate parameters validate # Create new branch if it different from source_branch -- GitLab From abc2f4434ab88e84e8c651089fdbb44b33f1f570 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 046/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 116f184c2404..cf7f00d31132 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - # params[:file_name] stores the new name for the file unless params[:file_name] == @path + previous_path = @path @path = params[:file_name] end -- GitLab From 29b3b2832c773356109e09905c9a170235e77a67 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 047/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index cf7f00d31132..2b8e76d4638f 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -47,7 +47,6 @@ def update previous_path = @path @path = params[:file_name] end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From ffe07fad954bad4e047412efebae8740e21417cc Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 048/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/projects/blob_controller.rb | 1 + app/services/files/base_service.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2b8e76d4638f..cf7f00d31132 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -47,6 +47,7 @@ def update previous_path = @path @path = params[:file_name] end + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index ac5d7ddde022..af7af5213c01 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 06608b4867a96a01fa562327fa3fc1e2cc77ac5b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 049/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index af7af5213c01..ac5d7ddde022 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,8 +15,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 2a7806b815a38e6d449e785a3340d0e681e42ea5 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 050/183] creates the update_file method in repository.rb and applies changes accordingly --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 2 +- app/models/repository.rb | 30 +++++++++++++++++++++ app/services/files/base_service.rb | 1 + app/services/files/update_service.rb | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 84b4a30c6d5e..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path + file_path: @path, + previous_path: @previous_path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index cf7f00d31132..5f4639d41191 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,7 @@ def update "#file-path-#{hexdigest(@path)}" else unless params[:file_name] == @path - previous_path = @path + @previous_path = @path @path = params[:file_name] end diff --git a/app/models/repository.rb b/app/models/repository.rb index 5b670cb4b8fa..709b5edd31e8 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,6 +731,36 @@ def commit_file(user, path, content, message, branch, update) end end + def update_file(user, path, previous_path, content, message, branch, update) + commit_with_hooks(user, branch) do |ref| + committer = user_to_committer(user) + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + + options[:file] = { + content: content, + path: path, + update: update + } + + Gitlab::Git::Blob.commit(raw_repository, options) + end + end + def remove_file(user, path, message, branch) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index ac5d7ddde022..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -9,6 +9,7 @@ def execute @commit_message = params[:commit_message] @file_path = params[:file_path] + @previous_path = params[:previous_path] @file_content = if params[:file_content_encoding] == 'base64' Base64.decode64(params[:file_content]) else diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 52451d72b571..6d015642b910 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,7 +4,7 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end end -- GitLab From 8230e50dadff14359a9ff5f620dfdb8cf6e62dba Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 051/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 6d015642b910..fefa1d4ef68f 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,6 @@ module Files class UpdateService < Files::BaseService def commit - # Need to update file_path with the new filename repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end -- GitLab From bde24b6938c0b9a68f658c9b6b124cc47d3b3a8c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 052/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 9a9ecc313f7963f134247e0815b285b5733e07c7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 053/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 66361f4cee2eb1482c9f9e77df8639ef7fa03a6c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 054/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 15 +++++++++++++++ app/controllers/concerns/creates_commit.rb | 8 ++++++++ app/controllers/projects/blob_controller.rb | 2 +- app/models/repository.rb | 19 ++++++++----------- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index f47084f9d903..6c27999cd189 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2' +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 055596b056f8..e759b22acf41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +PATH + remote: ~/src/Gitlab/gitlab_git + specs: + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + GEM remote: https://rubygems.org/ specs: @@ -274,11 +283,16 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< 9a9ecc313f7963f134247e0815b285b5733e07c7 gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) +======= + gitlab_emoji (0.3.1) + gemojione (~> 2.2, >= 2.2.1) +>>>>>>> refactors blob_controller gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -389,6 +403,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 5f4639d41191..13279cd3d60e 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,7 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name] == @path + unless params[:file_name].empty? @previous_path = @path @path = params[:file_name] end diff --git a/app/models/repository.rb b/app/models/repository.rb index 709b5edd31e8..b63713acdf57 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -739,25 +739,22 @@ def update_file(user, path, previous_path, content, message, branch, update) options[:author] = committer options[:commit] = { message: message, - branch: ref, + branch: ref } - if previous_path - options[:file] = { - path: previous_path - } - - - Gitlab::Git::Blob.remove(raw_repository, options) - end - options[:file] = { content: content, path: path, update: update } - Gitlab::Git::Blob.commit(raw_repository, options) + if previous_path + options[:file].merge!(previous_path: previous_path) + + Gitlab::Git::Blob.rename(raw_repository, options) + else + Gitlab::Git::Blob.commit(raw_repository, options) + end end end -- GitLab From 352788f4d82febda0e6561ca6b87efe0a8bf314b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 055/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From ec7a787a62ee85fcbe7d189c2a10f046cdc123f0 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 056/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From cd6b61427441f15a0c44861eaac00bce0128fa2a Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 057/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/models/repository.rb b/app/models/repository.rb index b63713acdf57..78854ea41dd0 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -739,15 +739,31 @@ def update_file(user, path, previous_path, content, message, branch, update) options[:author] = committer options[:commit] = { message: message, +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 branch: ref } +======= + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + +>>>>>>> creates the update_file method in repository.rb and applies changes accordingly options[:file] = { content: content, path: path, update: update } +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if previous_path options[:file].merge!(previous_path: previous_path) -- GitLab From 02e812c9677fb6392eab2fa3ab481bef9babaffc Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 058/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- app/controllers/concerns/creates_commit.rb | 8 -------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 6c27999cd189..9e9ecbfdf04c 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index e759b22acf41..9a7563bcbef7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -403,7 +405,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 5d32a96009ff777ddb38d9a0064da45211c2d978 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:07:16 +0100 Subject: [PATCH 059/183] adds change to CHANGELOG file --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 09f2c44e02cd..b0969de7d617 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.10.0 (unreleased) + - Add the functionality to be able to rename a file. !5049 (tiagonbotelho) - Fix commit builds API, return all builds for all pipelines for given commit. !4849 - Replace Haml with Hamlit to make view rendering faster. !3666 - Refactor repository paths handling to allow multiple git mount points -- GitLab From c84786c530dc46111ffc235e4e144975092352b7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 060/183] refactors to pass values as arguments through options --- app/models/repository.rb | 41 +++++++++------------------- app/services/files/update_service.rb | 4 ++- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 78854ea41dd0..d9c5ec817a01 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,45 +731,30 @@ def commit_file(user, path, content, message, branch, update) end end - def update_file(user, path, previous_path, content, message, branch, update) + # previous_path, message, update + def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - options = {} - options[:committer] = committer - options[:author] = committer - options[:commit] = { - message: message, -<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 + commit_options = {} + commit_options[:committer] = committer + commit_options[:author] = committer + commit_options[:commit] = { + message: options[:message], branch: ref } -======= - branch: ref, - } - - if previous_path - options[:file] = { - path: previous_path - } - - - Gitlab::Git::Blob.remove(raw_repository, options) - end - ->>>>>>> creates the update_file method in repository.rb and applies changes accordingly - options[:file] = { + commit_options[:file] = { content: content, path: path, - update: update + update: options[:update] } -<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 - if previous_path - options[:file].merge!(previous_path: previous_path) + if options[:previous_path] + commit_options[:file].merge!(previous_path: options[:previous_path]) - Gitlab::Git::Blob.rename(raw_repository, options) + Gitlab::Git::Blob.rename(raw_repository, commit_options) else - Gitlab::Git::Blob.commit(raw_repository, options) + Gitlab::Git::Blob.commit(raw_repository, commit_options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index fefa1d4ef68f..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,9 @@ module Files class UpdateService < Files::BaseService def commit - repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @file_content, + @target_branch, previous_path: @previous_path, + message: @commit_message, update: true) end end end -- GitLab From 43c5e1a509389a6a51316b5ed3458f14ae480c57 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 061/183] fixes issues for mr acceptance --- app/models/repository.rb | 2 +- app/views/projects/blob/_editor.html.haml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index d9c5ec817a01..39264726c9c1 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,7 +750,7 @@ def update_file(user, path, content, branch, options={}) } if options[:previous_path] - commit_options[:file].merge!(previous_path: options[:previous_path]) + commit_options[:file][:previous_path] = options[:previous_path] Gitlab::Git::Blob.rename(raw_repository, commit_options) else diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 3c64b2f5e96e..31bd4646d3dd 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,11 +4,9 @@ = icon('code-fork') = ref %span.editor-file-name - - if current_action?(:edit) && can?(current_user, :push_code, @project) - = text_field_tag 'file_name', params[:file_name], placeholder: @path, + -if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] or @path), class: 'form-control new-file-name' - - else - = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 8ec10899ee32dcdbeeef40e3416a5dcfbc802e0e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 062/183] implements the form for renaming the new filename on the file edit page --- app/views/projects/blob/_editor.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 31bd4646d3dd..b383f9dbee3e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -7,7 +7,6 @@ -if current_action?(:edit) || current_action?(:update) = text_field_tag 'file_name', (params[:file_name] or @path), class: 'form-control new-file-name' - - if current_action?(:new) || current_action?(:create) %span.editor-file-name \/ -- GitLab From 69544e8133fe74fd796bab609ff8843bba4d97ec Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 063/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 9e17b7b3a154e5e8743ff41ad704ad5168203b7e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 064/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From e31e1bd5d6b455d3697fa4e8ffcbe07259ac433b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 065/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 4791f87627354a6df6b8a8d5944399b0761b5ab8 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 066/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 20163de0ae1e8b02ac72347dfc28252d6714d40f Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 067/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 39264726c9c1..c0138514c0ff 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,7 +731,6 @@ def commit_file(user, path, content, message, branch, update) end end - # previous_path, message, update def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) -- GitLab From 64306128a1786f25354cbf20ec5dc4e4d6f79621 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 068/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 905c7a7c81ae..b0f8377c3d46 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -6,6 +6,7 @@ def commit repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) + end end end -- GitLab From fc69780bf60f915280da0a9b54a39af4b4f7e9b9 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 069/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From c8a4e2263956a80cb91c12cbbd1e008dcac6ee02 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 070/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From dc9027888e3c35d819bbb0b8ee46a40c797ae5b7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 071/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 12 ++++++++---- app/controllers/concerns/creates_commit.rb | 8 ++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9e9ecbfdf04c..6c27999cd189 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 9a7563bcbef7..746171a323aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,5 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 - branch: commit-blob-rename-action +PATH + remote: ~/src/Gitlab/gitlab_git specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -285,7 +283,11 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< c8a4e2263956a80cb91c12cbbd1e008dcac6ee02 <<<<<<< 9a9ecc313f7963f134247e0815b285b5733e07c7 +======= +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 +>>>>>>> refactors blob_controller gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -405,6 +407,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -878,6 +881,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_git (~> 10.2) + gitlab_emoji (~> 0.3.0) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 57c1f9e29a508733839656b288da87fa0780c002 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 072/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 19d208b4a36b9f710c13478a1e059d1d3f431ca1 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 073/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 7893b54df81874b105f49a6cfd0db8a0315c82ac Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 074/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index c0138514c0ff..882a79eda8e8 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,7 +750,6 @@ def update_file(user, path, content, branch, options={}) if options[:previous_path] commit_options[:file][:previous_path] = options[:previous_path] - Gitlab::Git::Blob.rename(raw_repository, commit_options) else Gitlab::Git::Blob.commit(raw_repository, commit_options) -- GitLab From 9786f376c327354ae368bc61f261937c19a5d496 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 075/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- app/controllers/concerns/creates_commit.rb | 8 -------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 6c27999cd189..9e9ecbfdf04c 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 746171a323aa..0044511007c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -407,7 +409,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 4307ac1bd3c80d0ff7b30ef7def0de457aa75f31 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 076/183] refactors to pass values as arguments through options --- app/services/files/update_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index b0f8377c3d46..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -6,7 +6,6 @@ def commit repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) - end end end -- GitLab From e36858231db42f64fb69af7d74f3ec6a898d8a70 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 077/183] fixes issues for mr acceptance --- app/models/repository.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/repository.rb b/app/models/repository.rb index 882a79eda8e8..c0138514c0ff 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,6 +750,7 @@ def update_file(user, path, content, branch, options={}) if options[:previous_path] commit_options[:file][:previous_path] = options[:previous_path] + Gitlab::Git::Blob.rename(raw_repository, commit_options) else Gitlab::Git::Blob.commit(raw_repository, commit_options) -- GitLab From 6cd8bc574b14acf9dc6576df4226126812d13f31 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 14:35:56 +0100 Subject: [PATCH 078/183] fixes merge conflicts for Gemfile.lock --- Gemfile.lock | 174 +++++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 83 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0044511007c6..c2a66c767e43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + revision: cfb423fb576590525c4a978bc21cc98917c3334c branch: commit-blob-rename-action specs: gitlab_git (10.3.0) @@ -68,14 +68,13 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - ast (2.2.0) + asciidoctor (1.5.4) + ast (2.3.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -99,7 +98,7 @@ GEM babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) - benchmark-ips (2.3.0) + benchmark-ips (2.6.1) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -111,13 +110,13 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.0.0) + bullet (5.1.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.9.0) + uniform_notifier (~> 1.10.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.5) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -125,7 +124,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.13) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -137,9 +136,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.6) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -149,15 +148,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.7.7) + colorize (0.8.1) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.1) + css_parser (1.4.5) addressable - d3_rails (3.5.11) + d3_rails (3.5.16) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -167,7 +166,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -184,7 +183,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.3) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -194,9 +193,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.0.8) - excon (0.49.0) - execjs (2.6.0) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -211,18 +210,21 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.10) - flay (2.6.1) + ffi (1.9.12) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.3.2) + flog (4.4.0) + path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.9.4) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -231,7 +233,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -244,8 +246,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.6) - fog-core (>= 1.39) + fog-openstack (0.1.7) + fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -256,9 +258,9 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.1.0) + font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.82.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.0.0) @@ -268,7 +270,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.0) + get_process_mem (0.2.1) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -285,20 +287,13 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) -<<<<<<< c8a4e2263956a80cb91c12cbbd1e008dcac6ee02 -<<<<<<< 9a9ecc313f7963f134247e0815b285b5733e07c7 -======= -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 ->>>>>>> refactors blob_controller gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) -======= gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) ->>>>>>> refactors blob_controller gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -307,7 +302,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.0) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -341,10 +336,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.3) + hashie (3.4.4) health_check (1.5.1) rails (>= 2.3.0) - hipchat (1.5.2) + hipchat (1.5.3) httparty mimemagic html-pipeline (1.11.0) @@ -355,10 +350,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.7.0.1) + httpclient (2.8.0) i18n (0.7.0) - ice_nine (0.11.1) - influxdb (0.2.3) + ice_nine (0.11.2) + influxdb (0.3.5) cause json ipaddress (0.8.3) @@ -378,7 +373,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.11.1) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -389,7 +384,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (2.1.2) bundler httparty rubyzip @@ -397,9 +392,10 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -409,24 +405,30 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mime-types-data (3.2016.0521) + mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.3.21) nested_form (0.3.2) - net-ldap (0.12.1) - net-ssh (3.0.1) - newrelic_rpm (3.14.1.311) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) +<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 oauth (0.4.7) oauth2 (1.2.0) +======= + oauth (0.5.1) + oauth2 (1.0.0) +>>>>>>> fixes merge conflicts for Gemfile.lock faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) @@ -437,7 +439,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) + omniauth-auth0 (1.4.2) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -456,7 +458,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.2.10) @@ -491,10 +493,11 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) + paranoia (2.1.5) activerecord (~> 4.0) - parser (2.3.1.0) + parser (2.3.1.2) ast (~> 2.2) + path_expander (1.0.0) pg (0.18.4) pkg-config (1.1.7) poltergeist (1.9.0) @@ -504,10 +507,10 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.8.7) + css_parser (>= 1.4.5) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) + premailer-rails (1.9.4) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.3) @@ -525,7 +528,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.1) + rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -560,19 +563,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.16.0) rake (10.5.0) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.0.0) + recaptcha (3.3.0) json - redcarpet (3.3.3) - redis (3.2.2) + redcarpet (3.3.4) + redis (3.3.0) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -591,16 +594,16 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.0) + request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.0) - rqrcode (0.7.0) - chunky_png + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) @@ -639,12 +642,13 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.3.0) nokogiri (>= 1.5.10) + ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.5.2) + rubyntlm (0.6.0) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.1.10) + rufus-scheduler (3.2.1) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -668,7 +672,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -683,7 +687,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -717,7 +721,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -778,7 +782,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) unicorn (4.9.0) kgio (~> 2.6) rack @@ -786,7 +790,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.9.0) + uniform_notifier (1.10.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -806,7 +810,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -881,8 +885,12 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) +<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 gitlab_git (~> 10.2) gitlab_emoji (~> 0.3.0) +======= + gitlab_git (~> 10.2)! +>>>>>>> fixes merge conflicts for Gemfile.lock gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) @@ -1007,4 +1015,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.10.6 -- GitLab From 484567e62b20dcaf9132166ea27ca68fd8d94b39 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:36:22 +0100 Subject: [PATCH 079/183] fixes merge request edit bug where it would generate a cloned file and not remove the previous one --- Gemfile.lock | 1 - app/controllers/projects/blob_controller.rb | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c2a66c767e43..b9f8dace30cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -405,7 +405,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 13279cd3d60e..091b661a09f6 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,16 +38,16 @@ def edit end def update + unless params[:file_name].empty? + @previous_path = @path + @path = params[:file_name] + end + after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name].empty? - @previous_path = @path - @path = params[:file_name] - end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From 89f2e6a7318e991aa0979b7ec5f3ed387af4bc81 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:51:02 +0100 Subject: [PATCH 080/183] fixes more issues for MR acceptance --- app/models/repository.rb | 24 +++++++++++------------ app/services/files/update_service.rb | 5 +++-- app/views/projects/blob/_editor.html.haml | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index c0138514c0ff..538d91a77d73 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,29 +731,29 @@ def commit_file(user, path, content, message, branch, update) end end - def update_file(user, path, content, branch, options={}) + def update_file(user, path, content, branch:, previous_path:, message:) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - commit_options = {} - commit_options[:committer] = committer - commit_options[:author] = committer - commit_options[:commit] = { - message: options[:message], + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, branch: ref } - commit_options[:file] = { + options[:file] = { content: content, path: path, - update: options[:update] + update: true } - if options[:previous_path] - commit_options[:file][:previous_path] = options[:previous_path] + if previous_path + options[:file][:previous_path] = previous_path - Gitlab::Git::Blob.rename(raw_repository, commit_options) + Gitlab::Git::Blob.rename(raw_repository, options) else - Gitlab::Git::Blob.commit(raw_repository, commit_options) + Gitlab::Git::Blob.commit(raw_repository, options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 905c7a7c81ae..8d2b5083179e 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,8 +4,9 @@ module Files class UpdateService < Files::BaseService def commit repository.update_file(current_user, @file_path, @file_content, - @target_branch, previous_path: @previous_path, - message: @commit_message, update: true) + branch: @target_branch, + previous_path: @previous_path, + message: @commit_message) end end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index b383f9dbee3e..8a22e9126244 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,8 +4,8 @@ = icon('code-fork') = ref %span.editor-file-name - -if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] or @path), + - if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] || @path), class: 'form-control new-file-name' - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From f219863862d6345f002462edcbcaa9bc70364621 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:04 +0100 Subject: [PATCH 081/183] removes the git path for the gitlab_git gem corresponding to this MR dependency --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9e9ecbfdf04c..f47084f9d903 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "browser", '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +gem "gitlab_git", '~> 10.2' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes -- GitLab From 1d80c06bbc7f258b2d93f4f2b8a1508b95bc372b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:33 +0100 Subject: [PATCH 082/183] removes Gemfile.lock --- Gemfile.lock | 1017 -------------------------------------------------- 1 file changed, 1017 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b9f8dace30cd..000000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,1017 +0,0 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: cfb423fb576590525c4a978bc21cc98917c3334c - branch: commit-blob-rename-action - specs: - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - better_errors (1.0.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) - ffi (1.9.12) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) -<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 - oauth (0.4.7) - oauth2 (1.2.0) -======= - oauth (0.5.1) - oauth2 (1.0.0) ->>>>>>> fixes merge conflicts for Gemfile.lock - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet - bundler-audit - byebug - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay - flog - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) -<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 - gitlab_git (~> 10.2) - gitlab_emoji (~> 0.3.0) -======= - gitlab_git (~> 10.2)! ->>>>>>> fixes merge conflicts for Gemfile.lock - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 1.5.1) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack - letter_opener_web (~> 1.3.0) - license_finder - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.2.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.6 -- GitLab From 595f4584c10716ebe657604a103fecf285cce5b6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 10:40:10 +0100 Subject: [PATCH 083/183] adds Gemfile.lock to mr --- Gemfile.lock | 994 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 994 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..8809edb0fc98 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,994 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.3.0) + activerecord (>= 3.0) + akismet (2.0.0) + allocations (1.0.5) + arel (6.0.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.4) + ast (2.3.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) + execjs + awesome_print (1.2.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) + babosa (1.0.2) + base32 (0.3.2) + bcrypt (3.1.11) + benchmark-ips (2.6.1) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + brakeman (3.3.2) + browser (2.2.0) + builder (3.2.2) + bullet (5.1.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (9.0.5) + capybara (2.6.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.13) + capybara (>= 1.0, < 3) + launchy + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.6) + cliver (0.3.2) + coderay (1.1.1) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorize (0.8.1) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + creole (0.5.0) + css_parser (1.4.5) + addressable + d3_rails (3.5.16) + railties (>= 3.1.0) + daemons (1.2.3) + database_cleaner (1.4.1) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + default_value_for (3.0.1) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.2.5) + diffy (3.0.7) + docile (1.1.5) + doorkeeper (4.0.0) + railties (>= 4.2) + dropzonejs-rails (0.7.3) + rails (> 3.1) + email_reply_parser (0.5.8) + email_spec (1.6.0) + launchy (~> 2.1) + mail (~> 2.2) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) + expression_parser (0.9.0) + factory_girl (4.5.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) + railties (>= 3.0.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + ffaker (2.0.0) + ffi (1.9.13) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) + ruby_parser (~> 3.0) + sexp_processor (~> 4.0) + flog (4.4.0) + path_expander (~> 1.0) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aws (0.9.4) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.42.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-google (0.3.2) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.0) + fog-core (~> 1.27) + fog-openstack (0.1.7) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.6.3.1) + railties (>= 3.2, < 5.1) + foreman (0.82.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.6.1) + json + get_process_mem (0.2.1) + gherkin-ruby (0.3.2) + github-linguist (4.7.6) + charlock_holmes (~> 0.7.3) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.23.0b) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grit (2.8.1) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16, < 3) + posix-spawn (~> 0.3) + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.3) + globalid (0.3.6) + activesupport (>= 4.1.0) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) + gon (6.0.1) + actionpack (>= 3.0) + json + multi_json + request_store (>= 1.0) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + hamlit (2.5.0) + temple (~> 0.7.6) + thor + tilt + hashie (3.4.4) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.3) + httparty + mimemagic + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + htmlentities (4.3.4) + http_parser.rb (0.5.3) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.8.0) + i18n (0.7.0) + ice_nine (0.11.2) + influxdb (0.3.5) + cause + json + ipaddress (0.8.3) + jquery-atwho-rails (1.3.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + jwt (1.5.4) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.10.0) + knapsack (1.11.1) + rake + timecop (>= 0.1.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.2) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.1) + mini_portile2 (2.1.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + mysql2 (0.3.21) + nested_form (0.3.2) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + numerizer (0.1.1) + oauth (0.5.1) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (~> 1.2) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-auth0 (1.4.2) + omniauth-oauth2 (~> 1.1) + omniauth-azure-oauth2 (0.0.6) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-cas3 (1.1.3) + addressable (~> 2.3) + nokogiri (~> 1.6.6) + omniauth (~> 1.2) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-gitlab (1.0.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) + omniauth-shibboleth (1.2.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + paranoia (2.1.5) + activerecord (~> 4.0) + parser (2.3.1.2) + ast (~> 2.2) + path_expander (1.0.0) + pg (0.18.4) + pkg-config (1.1.7) + poltergeist (1.9.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + powerpack (0.1.1) + premailer (1.8.7) + css_parser (>= 1.4.5) + htmlentities (>= 4.0.0) + premailer-rails (1.9.4) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.3.1) + rack + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-oauth2 (1.2.3) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (2.1.0) + raindrops (0.16.0) + rake (10.5.0) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rdoc (3.12.2) + json (~> 1.4) + recaptcha (3.3.0) + json + redcarpet (3.3.4) + redis (3.3.0) + redis-actionpack (4.0.1) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.1.5) + activesupport (>= 3, < 5) + redis-store (~> 1.1.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.7) + redis (>= 2.2) + request_store (1.3.1) + rerun (0.11.0) + listen (~> 3.0) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) + nokogiri (>= 1.5.10) + ruby_dep (1.3.1) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) + rubyntlm (0.6.0) + rubypants (0.2.0) + rubyzip (1.2.0) + rufus-scheduler (3.2.1) + rugged (0.24.0) + safe_yaml (1.0.4) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.10) + thor (~> 0.14) + sentry-raven (1.1.0) + faraday (>= 0.7.6) + settingslogic (2.0.9) + sexp_processor (4.7.0) + sham_rack (1.3.6) + rack + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + sidekiq (4.1.4) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) + sidekiq-cron (0.4.2) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.0.0) + simple_oauth (0.1.9) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + six (0.2.0) + slack-notifier (1.2.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + spring-commands-spinach (1.1.0) + spring (>= 0.9.1) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) + state_machines-activemodel (>= 0.3.0) + stringex (2.5.2) + sys-filesystem (1.1.6) + ffi + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.7.7) + test_after_commit (0.4.2) + activerecord (>= 3.2) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) + twitter-stream (~> 0.1) + turbolinks (2.5.3) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + u2f (0.2.1) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.1.0) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.10.0) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.1.0) + warden (1.2.6) + rack (>= 1.0) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + wikicloth (0.8.1) + builder + expression_parser + rinku + xml-simple (1.1.5) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-session_store (~> 1.0.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + akismet (~> 2.0) + allocations (~> 1.0) + asana (~> 0.4.0) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 3.0.0) + awesome_print (~> 1.2.0) + babosa (~> 1.0.2) + base32 (~> 0.3.0) + benchmark-ips + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) + bootstrap-sass (~> 3.3.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet + bundler-audit + byebug + capybara (~> 2.6.2) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.10.0) + charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) + coffee-rails (~> 4.1.0) + connection_pool (~> 2.0) + creole (~> 0.5.0) + d3_rails (~> 3.5.0) + database_cleaner (~> 1.4.0) + default_value_for (~> 3.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) + diffy (~> 3.0.3) + doorkeeper (~> 4.0) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + factory_girl_rails (~> 4.6.0) + ffaker (~> 2.0.0) + flay + flog + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman + fuubar (~> 2.0.0) + gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) + github-linguist (~> 4.7.0) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab_git (~> 10.2) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.1.0) + gollum-rugged_adapter (~> 0.4.2) + gon (~> 6.0.1) + grape (~> 0.13.0) + grape-entity (~> 0.4.2) + hamlit (~> 2.5) + health_check (~> 1.5.1) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + influxdb (~> 0.2) + jquery-atwho-rails (~> 1.3.2) + jquery-rails (~> 4.1.0) + jquery-turbolinks (~> 2.1.0) + jquery-ui-rails (~> 5.0.0) + jwt + kaminari (~> 0.17.0) + knapsack + letter_opener_web (~> 1.3.0) + license_finder + licensee (~> 8.0.0) + loofah (~> 2.0.3) + mail_room (~> 0.8) + method_source (~> 0.8) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) + oauth2 (~> 1.0.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) + omniauth-azure-oauth2 (~> 0.0.6) + omniauth-bitbucket (~> 0.0.2) + omniauth-cas3 (~> 1.1.2) + omniauth-facebook (~> 3.0.0) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.0) + omniauth-kerberos (~> 0.3.0) + omniauth-saml (~> 1.6.0) + omniauth-shibboleth (~> 1.2.0) + omniauth-twitter (~> 1.2.0) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails + rack-attack (~> 4.3.1) + rack-cors (~> 0.4.0) + rack-oauth2 (~> 1.2.1) + rails (= 4.2.6) + rails-deprecated_sanitizer (~> 1.0.3) + rainbow (~> 2.1.0) + rblineprof + rdoc (~> 3.6) + recaptcha (~> 3.0) + redcarpet (~> 3.3.3) + redis (~> 3.2) + redis-namespace + redis-rails (~> 4.0.0) + request_store (~> 1.3.0) + rerun (~> 0.11.0) + responders (~> 2.0) + rouge (~> 1.11) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.5.0) + rspec-retry + rubocop (~> 0.40.0) + rubocop-rspec (~> 1.5.0) + ruby-fogbugz (~> 0.2.1) + sanitize (~> 2.0) + sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + sentry-raven (~> 1.1.0) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (~> 4.0) + sidekiq-cron (~> 0.4.0) + simplecov (~> 0.11.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.2.0) + spinach-rails (~> 0.2.1) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.1.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) + task_list (~> 1.0.2) + teaspoon (~> 1.1.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.4.2) + thin (~> 1.7.0) + tinder (~> 1.10.0) + turbolinks (~> 2.5.0) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + underscore-rails (~> 1.8.0) + unf (~> 0.1.4) + unicorn (~> 4.9.0) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + vmstat (~> 2.1.0) + web-console (~> 2.0) + webmock (~> 1.21.0) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.12.5 -- GitLab From 50a077b995f7c40bcd4ee6986165c4324ae15a4d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 13:07:43 +0100 Subject: [PATCH 084/183] removes Gemfile.lock from project --- Gemfile.lock | 994 --------------------------------------------------- 1 file changed, 994 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 8809edb0fc98..000000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,994 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - better_errors (1.0.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) - ffi (1.9.13) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) - oauth (0.5.1) - oauth2 (1.0.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (~> 1.2) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet - bundler-audit - byebug - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay - flog - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.2) - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 1.5.1) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack - letter_opener_web (~> 1.3.0) - license_finder - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.0.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.12.5 -- GitLab From 36dc6638571bf724a02ecdbdc639334efbbda60b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 13:41:26 +0100 Subject: [PATCH 085/183] adds Gemfile.lock --- Gemfile.lock | 989 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 989 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..055596b056f8 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,989 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.3.0) + activerecord (>= 3.0) + akismet (2.0.0) + allocations (1.0.5) + arel (6.0.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.3) + ast (2.2.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) + attr_required (1.0.0) + autoprefixer-rails (6.2.3) + execjs + json + awesome_print (1.2.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) + babosa (1.0.2) + base32 (0.3.2) + bcrypt (3.1.11) + benchmark-ips (2.3.0) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + brakeman (3.3.2) + browser (2.2.0) + builder (3.2.2) + bullet (5.0.0) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.9.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (8.2.1) + capybara (2.6.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.11) + capybara (>= 1.0, < 3) + launchy + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.5) + cliver (0.3.2) + coderay (1.1.0) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorize (0.7.7) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + creole (0.5.0) + css_parser (1.4.1) + addressable + d3_rails (3.5.11) + railties (>= 3.1.0) + daemons (1.2.3) + database_cleaner (1.4.1) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + default_value_for (3.0.1) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (4.1.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.2.5) + diffy (3.0.7) + docile (1.1.5) + doorkeeper (4.0.0) + railties (>= 4.2) + dropzonejs-rails (0.7.2) + rails (> 3.1) + email_reply_parser (0.5.8) + email_spec (1.6.0) + launchy (~> 2.1) + mail (~> 2.2) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + eventmachine (1.0.8) + excon (0.49.0) + execjs (2.6.0) + expression_parser (0.9.0) + factory_girl (4.5.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) + railties (>= 3.0.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + ffaker (2.0.0) + ffi (1.9.10) + flay (2.6.1) + ruby_parser (~> 3.0) + sexp_processor (~> 4.0) + flog (4.3.2) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aws (0.9.2) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.40.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-google (0.3.2) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.0) + fog-core (~> 1.27) + fog-openstack (0.1.6) + fog-core (>= 1.39) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.6.1.0) + railties (>= 3.2, < 5.1) + foreman (0.78.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.6.1) + json + get_process_mem (0.2.0) + gherkin-ruby (0.3.2) + github-linguist (4.7.6) + charlock_holmes (~> 0.7.3) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.23.0b) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grit (2.8.1) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16, < 3) + posix-spawn (~> 0.3) + gitlab_git (10.2.3) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.3) + globalid (0.3.6) + activesupport (>= 4.1.0) + gollum-grit_adapter (1.0.0) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) + gon (6.0.1) + actionpack (>= 3.0) + json + multi_json + request_store (>= 1.0) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + hamlit (2.5.0) + temple (~> 0.7.6) + thor + tilt + hashie (3.4.3) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.2) + httparty + mimemagic + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + htmlentities (4.3.4) + http_parser.rb (0.5.3) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.7.0.1) + i18n (0.7.0) + ice_nine (0.11.1) + influxdb (0.2.3) + cause + json + ipaddress (0.8.3) + jquery-atwho-rails (1.3.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + jwt (1.5.4) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.10.0) + knapsack (1.11.0) + rake + timecop (>= 0.1.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.0) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) + listen (3.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + loofah (2.0.3) + nokogiri (>= 1.5.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.0) + mini_portile2 (2.1.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + mysql2 (0.3.20) + nested_form (0.3.2) + net-ldap (0.12.1) + net-ssh (3.0.1) + newrelic_rpm (3.14.1.311) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + numerizer (0.1.1) + oauth (0.4.7) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-auth0 (1.4.1) + omniauth-oauth2 (~> 1.1) + omniauth-azure-oauth2 (0.0.6) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-cas3 (1.1.3) + addressable (~> 2.3) + nokogiri (~> 1.6.6) + omniauth (~> 1.2) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-gitlab (1.0.1) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) + omniauth-shibboleth (1.2.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + paranoia (2.1.4) + activerecord (~> 4.0) + parser (2.3.1.0) + ast (~> 2.2) + pg (0.18.4) + pkg-config (1.1.7) + poltergeist (1.9.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + powerpack (0.1.1) + premailer (1.8.6) + css_parser (>= 1.3.6) + htmlentities (>= 4.0.0) + premailer-rails (1.9.2) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.3.1) + rack + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-oauth2 (1.2.1) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (2.1.0) + raindrops (0.15.0) + rake (10.5.0) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rdoc (3.12.2) + json (~> 1.4) + recaptcha (3.0.0) + json + redcarpet (3.3.3) + redis (3.2.2) + redis-actionpack (4.0.1) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.1.5) + activesupport (>= 3, < 5) + redis-store (~> 1.1.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.7) + redis (>= 2.2) + request_store (1.3.0) + rerun (0.11.0) + listen (~> 3.0) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (1.11.0) + rqrcode (0.7.0) + chunky_png + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.0) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) + nokogiri (>= 1.5.10) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) + rubyntlm (0.5.2) + rubypants (0.2.0) + rubyzip (1.2.0) + rufus-scheduler (3.1.10) + rugged (0.24.0) + safe_yaml (1.0.4) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.9.3) + thor (~> 0.14) + sentry-raven (1.1.0) + faraday (>= 0.7.6) + settingslogic (2.0.9) + sexp_processor (4.7.0) + sham_rack (1.3.6) + rack + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + sidekiq (4.1.4) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) + sidekiq-cron (0.4.0) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.0.0) + simple_oauth (0.1.9) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + six (0.2.0) + slack-notifier (1.2.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + spring-commands-spinach (1.1.0) + spring (>= 0.9.1) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (3.6.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) + state_machines-activemodel (>= 0.3.0) + stringex (2.5.2) + sys-filesystem (1.1.6) + ffi + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.7.7) + test_after_commit (0.4.2) + activerecord (>= 3.2) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) + twitter-stream (~> 0.1) + turbolinks (2.5.3) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + u2f (0.2.1) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.0.5) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.9.0) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.1.0) + warden (1.2.6) + rack (>= 1.0) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket-driver (0.6.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + wikicloth (0.8.1) + builder + expression_parser + rinku + xml-simple (1.1.5) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-session_store (~> 1.0.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + akismet (~> 2.0) + allocations (~> 1.0) + asana (~> 0.4.0) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 3.0.0) + awesome_print (~> 1.2.0) + babosa (~> 1.0.2) + base32 (~> 0.3.0) + benchmark-ips + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) + bootstrap-sass (~> 3.3.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet + bundler-audit + byebug + capybara (~> 2.6.2) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.10.0) + charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) + coffee-rails (~> 4.1.0) + connection_pool (~> 2.0) + creole (~> 0.5.0) + d3_rails (~> 3.5.0) + database_cleaner (~> 1.4.0) + default_value_for (~> 3.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) + diffy (~> 3.0.3) + doorkeeper (~> 4.0) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + factory_girl_rails (~> 4.6.0) + ffaker (~> 2.0.0) + flay + flog + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman + fuubar (~> 2.0.0) + gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) + github-linguist (~> 4.7.0) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab_git (~> 10.2) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.1.0) + gollum-rugged_adapter (~> 0.4.2) + gon (~> 6.0.1) + grape (~> 0.13.0) + grape-entity (~> 0.4.2) + hamlit (~> 2.5) + health_check (~> 1.5.1) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + influxdb (~> 0.2) + jquery-atwho-rails (~> 1.3.2) + jquery-rails (~> 4.1.0) + jquery-turbolinks (~> 2.1.0) + jquery-ui-rails (~> 5.0.0) + jwt + kaminari (~> 0.17.0) + knapsack + letter_opener_web (~> 1.3.0) + license_finder + licensee (~> 8.0.0) + loofah (~> 2.0.3) + mail_room (~> 0.8) + method_source (~> 0.8) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) + oauth2 (~> 1.2.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) + omniauth-azure-oauth2 (~> 0.0.6) + omniauth-bitbucket (~> 0.0.2) + omniauth-cas3 (~> 1.1.2) + omniauth-facebook (~> 3.0.0) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.0) + omniauth-kerberos (~> 0.3.0) + omniauth-saml (~> 1.6.0) + omniauth-shibboleth (~> 1.2.0) + omniauth-twitter (~> 1.2.0) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails + rack-attack (~> 4.3.1) + rack-cors (~> 0.4.0) + rack-oauth2 (~> 1.2.1) + rails (= 4.2.6) + rails-deprecated_sanitizer (~> 1.0.3) + rainbow (~> 2.1.0) + rblineprof + rdoc (~> 3.6) + recaptcha (~> 3.0) + redcarpet (~> 3.3.3) + redis (~> 3.2) + redis-namespace + redis-rails (~> 4.0.0) + request_store (~> 1.3.0) + rerun (~> 0.11.0) + responders (~> 2.0) + rouge (~> 1.11) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.5.0) + rspec-retry + rubocop (~> 0.40.0) + rubocop-rspec (~> 1.5.0) + ruby-fogbugz (~> 0.2.1) + sanitize (~> 2.0) + sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + sentry-raven (~> 1.1.0) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (~> 4.0) + sidekiq-cron (~> 0.4.0) + simplecov (~> 0.11.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.2.0) + spinach-rails (~> 0.2.1) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.1.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) + task_list (~> 1.0.2) + teaspoon (~> 1.1.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.4.2) + thin (~> 1.7.0) + tinder (~> 1.10.0) + turbolinks (~> 2.5.0) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + underscore-rails (~> 1.8.0) + unf (~> 0.1.4) + unicorn (~> 4.9.0) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + vmstat (~> 2.1.0) + web-console (~> 2.0) + webmock (~> 1.21.0) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.12.5 -- GitLab From 5d6b90a050a30442f9cd44eafa1c7ed79f005bba Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 13:46:21 +0100 Subject: [PATCH 086/183] changes gemfile.lock --- Gemfile.lock | 159 +++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 82 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f300e1968653..055596b056f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,13 +57,14 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) + asciidoctor (1.5.3) + ast (2.2.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) + attr_required (1.0.0) + autoprefixer-rails (6.2.3) execjs + json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -87,7 +88,7 @@ GEM babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) - benchmark-ips (2.6.1) + benchmark-ips (2.3.0) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -99,13 +100,13 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.1.1) + bullet (5.0.0) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) + uniform_notifier (~> 1.9.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.5) + byebug (8.2.1) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -113,7 +114,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.13) + capybara-screenshot (1.0.11) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -125,9 +126,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.6) + chunky_png (1.3.5) cliver (0.3.2) - coderay (1.1.1) + coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -137,15 +138,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.8.1) + colorize (0.7.7) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.5) + css_parser (1.4.1) addressable - d3_rails (3.5.16) + d3_rails (3.5.11) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -155,7 +156,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) + devise (4.1.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -172,7 +173,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.3) + dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -182,9 +183,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) + eventmachine (1.0.8) + excon (0.49.0) + execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -199,21 +200,18 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.13) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) + ffi (1.9.10) + flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) + flog (4.3.2) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) + fog-aws (0.9.2) + fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -222,7 +220,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.42.0) + fog-core (1.40.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -235,8 +233,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) + fog-openstack (0.1.6) + fog-core (>= 1.39) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -247,9 +245,9 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.6.1.0) railties (>= 3.2, < 5.1) - foreman (0.82.0) + foreman (0.78.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.0.0) @@ -259,7 +257,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.1) + get_process_mem (0.2.0) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -276,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.3.0) + gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -289,7 +287,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) + gollum-grit_adapter (1.0.0) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -323,10 +321,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.4) + hashie (3.4.3) health_check (1.5.1) rails (>= 2.3.0) - hipchat (1.5.3) + hipchat (1.5.2) httparty mimemagic html-pipeline (1.11.0) @@ -337,10 +335,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.0) + httpclient (2.7.0.1) i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) + ice_nine (0.11.1) + influxdb (0.2.3) cause json ipaddress (0.8.3) @@ -360,7 +358,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.1) + knapsack (1.11.0) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -371,7 +369,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.2) + license_finder (2.1.0) bundler httparty rubyzip @@ -379,10 +377,9 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -392,18 +389,18 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.1) + mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.21) + mysql2 (0.3.20) nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) + net-ldap (0.12.1) + net-ssh (3.0.1) + newrelic_rpm (3.14.1.311) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -420,7 +417,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) + omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -439,7 +436,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) + omniauth-gitlab (1.0.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.2.10) @@ -474,11 +471,10 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.5) + paranoia (2.1.4) activerecord (~> 4.0) - parser (2.3.1.2) + parser (2.3.1.0) ast (~> 2.2) - path_expander (1.0.0) pg (0.18.4) pkg-config (1.1.7) poltergeist (1.9.0) @@ -488,10 +484,10 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) + premailer (1.8.6) + css_parser (>= 1.3.6) htmlentities (>= 4.0.0) - premailer-rails (1.9.4) + premailer-rails (1.9.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.3) @@ -509,7 +505,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.3) + rack-oauth2 (1.2.1) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -544,19 +540,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.16.0) + raindrops (0.15.0) rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.3.0) + recaptcha (3.0.0) json - redcarpet (3.3.4) - redis (3.3.0) + redcarpet (3.3.3) + redis (3.2.2) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -575,23 +571,23 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.1) + request_store (1.3.0) rerun (0.11.0) listen (~> 3.0) - responders (2.2.0) + responders (2.1.1) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) + rouge (1.11.0) + rqrcode (0.7.0) + chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) + rspec-core (3.5.0) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -599,7 +595,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-rails (3.5.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -623,13 +619,12 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.3.0) nokogiri (>= 1.5.10) - ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.6.0) + rubyntlm (0.5.2) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.2.1) + rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -653,7 +648,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.10) + select2-rails (3.5.9.3) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -668,7 +663,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) + sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -702,7 +697,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.6.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -763,7 +758,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.0.5) unicorn (4.9.0) kgio (~> 2.6) rack @@ -771,7 +766,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.10.0) + uniform_notifier (1.9.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -791,7 +786,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.4) + websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) -- GitLab From 2298c003b6d2d511fedef2f50a5570ffd3e017df Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 11 Jul 2016 17:11:16 +0100 Subject: [PATCH 087/183] changes the usasge of path to file_path on blob_controller for compatibillity with the create action --- app/controllers/concerns/creates_commit.rb | 2 +- app/controllers/projects/blob_controller.rb | 8 ++++---- app/views/projects/blob/_editor.html.haml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a76fcd61b526 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,7 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path, + file_path: @file_path, previous_path: @previous_path ) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 091b661a09f6..fb6ddd0e51d6 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -39,16 +39,16 @@ def edit def update unless params[:file_name].empty? - @previous_path = @path - @path = params[:file_name] + @previous_path = @file_path + @file_path = params[:file_name] end after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@path)}" + "#file-path-#{hexdigest(@file_path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index ad3009f30ab7..ba3b3439e9ba 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -5,7 +5,7 @@ = ref %span.editor-file-name - if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] || @path), + = text_field_tag 'file_name', (params[:file_name] || @file_path), class: 'form-control new-file-name' - if current_action?(:new) || current_action?(:create) -- GitLab From 3161d5d29b22bfb446443bcc71926378b4b7f01d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 11:49:21 +0100 Subject: [PATCH 088/183] refactors update action to change commit_params with the correct path --- Gemfile.lock | 2 +- app/controllers/concerns/creates_commit.rb | 1 - app/controllers/projects/blob_controller.rb | 9 +++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 055596b056f8..199ee6849701 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.2.3) + gitlab_git (10.3.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a76fcd61b526..f2b8f297bc27 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,6 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @file_path, previous_path: @previous_path ) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index fb6ddd0e51d6..ac1141b8613e 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -39,16 +39,17 @@ def edit def update unless params[:file_name].empty? - @previous_path = @file_path - @file_path = params[:file_name] + @previous_path = @path + @path = params[:file_name] + @commit_params[:file_path] = @path end after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@file_path)}" + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, -- GitLab From c7c0392a0401f71802a1120b3244fac1e2ca1c4b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 12:48:24 +0100 Subject: [PATCH 089/183] test for nil params :file_name --- app/controllers/projects/blob_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index ac1141b8613e..0120ad8e0582 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,7 +38,7 @@ def edit end def update - unless params[:file_name].empty? + unless params[:file_name].nil? || params[:file_name].empty? @previous_path = @path @path = params[:file_name] @commit_params[:file_path] = @path -- GitLab From b34310ae9e9d3d4331b38f1acf4a51e2247b76ac Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 090/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 3 ++- app/services/files/update_service.rb | 1 + app/views/projects/blob/_editor.html.haml | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 5356fdf010df..bcd436f2429a 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + # params[:file_name] stores the new name for the file + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 1960dc7d949c..52451d72b571 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + # Need to update file_path with the new filename repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 29c7d45074a2..3c64b2f5e96e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,7 +4,11 @@ = icon('code-fork') = ref %span.editor-file-name - = @path + - if current_action?(:edit) && can?(current_user, :push_code, @project) + = text_field_tag 'file_name', params[:file_name], placeholder: @path, + class: 'form-control new-file-name' + - else + = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From ac30c60ad9379187e41629ac56c96bd02df6996e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 091/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index dacb5679dd30..84b4a30c6d5e 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,7 +7,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch + target_branch: @target_branch, + file_path: @path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index bcd436f2429a..116f184c2404 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,11 @@ def update "#file-path-#{hexdigest(@path)}" else # params[:file_name] stores the new name for the file - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, params[:file_name])) + unless params[:file_name] == @path + @path = params[:file_name] + end + + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, -- GitLab From ea50760b02ede0366ab5640a8007752b3a9d0496 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 092/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 116f184c2404..cf7f00d31132 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,8 +43,8 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - # params[:file_name] stores the new name for the file unless params[:file_name] == @path + previous_path = @path @path = params[:file_name] end -- GitLab From bb627b6fc24d71a0ee19fd35d987e423a2567c48 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 093/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index cf7f00d31132..2b8e76d4638f 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -47,7 +47,6 @@ def update previous_path = @path @path = params[:file_name] end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From be3777f77857707ad19358c837703d3690b89256 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 094/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 37c5e321b39e..9abee4e349a4 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,6 +15,12 @@ def execute params[:file_content] end +<<<<<<< bb627b6fc24d71a0ee19fd35d987e423a2567c48 +======= + puts @file_path + + # Validate parameters +>>>>>>> successfully adds the new version with the updated name on the projects repo validate # Create new branch if it different from source_branch -- GitLab From 385afc28efcd7b496b0c518a5490716265cdf87c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 095/183] remove prints and useless comments --- app/services/files/base_service.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 9abee4e349a4..ac5d7ddde022 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -15,12 +15,7 @@ def execute params[:file_content] end -<<<<<<< bb627b6fc24d71a0ee19fd35d987e423a2567c48 -======= - puts @file_path - # Validate parameters ->>>>>>> successfully adds the new version with the updated name on the projects repo validate # Create new branch if it different from source_branch -- GitLab From 9951854648a1dc98bbff016c51cd47e67f240267 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 096/183] creates the update_file method in repository.rb and applies changes accordingly --- app/controllers/concerns/creates_commit.rb | 3 ++- app/controllers/projects/blob_controller.rb | 2 +- app/models/repository.rb | 30 +++++++++++++++++++++ app/services/files/base_service.rb | 1 + app/services/files/update_service.rb | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 84b4a30c6d5e..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path + file_path: @path, + previous_path: @previous_path ) result = service.new(@tree_edit_project, current_user, commit_params).execute diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2b8e76d4638f..fc608399fcb2 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,7 +44,7 @@ def update "#file-path-#{hexdigest(@path)}" else unless params[:file_name] == @path - previous_path = @path + @previous_path = @path @path = params[:file_name] end namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) diff --git a/app/models/repository.rb b/app/models/repository.rb index 5b670cb4b8fa..709b5edd31e8 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,6 +731,36 @@ def commit_file(user, path, content, message, branch, update) end end + def update_file(user, path, previous_path, content, message, branch, update) + commit_with_hooks(user, branch) do |ref| + committer = user_to_committer(user) + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + + options[:file] = { + content: content, + path: path, + update: update + } + + Gitlab::Git::Blob.commit(raw_repository, options) + end + end + def remove_file(user, path, message, branch) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index ac5d7ddde022..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -9,6 +9,7 @@ def execute @commit_message = params[:commit_message] @file_path = params[:file_path] + @previous_path = params[:previous_path] @file_content = if params[:file_content_encoding] == 'base64' Base64.decode64(params[:file_content]) else diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 52451d72b571..6d015642b910 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,7 +4,7 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end end -- GitLab From ba8f8f2269fbad6f3480a40f350fc269140db583 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 097/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 6d015642b910..fefa1d4ef68f 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,6 @@ module Files class UpdateService < Files::BaseService def commit - # Need to update file_path with the new filename repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end -- GitLab From 561c3b5d61ec73ef1424f7cc8e97e3eebcbb6296 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 098/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From eb1feae09eeed1236694f85129acd9133cb530b6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 099/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 1d5d5b1a428f389ba4d9e66c17852e115ba32f83 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 100/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 14 +++++++++++++ app/controllers/concerns/creates_commit.rb | 8 +++++++ app/controllers/projects/blob_controller.rb | 2 +- app/models/repository.rb | 23 ++++++++++++--------- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 5c43015e52c6..1fc1be9e2724 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.2' +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index f8018e58a5e7..d65616ad7665 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +PATH + remote: ~/src/Gitlab/gitlab_git + specs: + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + GEM remote: https://rubygems.org/ specs: @@ -279,6 +288,9 @@ GEM charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) + gitlab_emoji (0.3.1) + gemojione (~> 2.2, >= 2.2.1) +>>>>>>> refactors blob_controller gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -389,6 +401,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -862,6 +875,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_git (~> 10.2) + gitlab_emoji (~> 0.3.0) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index fc608399fcb2..4d8bb5be20bb 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -43,7 +43,7 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name] == @path + unless params[:file_name].empty? @previous_path = @path @path = params[:file_name] end diff --git a/app/models/repository.rb b/app/models/repository.rb index 709b5edd31e8..36f51da8875c 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -742,22 +742,25 @@ def update_file(user, path, previous_path, content, message, branch, update) branch: ref, } - if previous_path - options[:file] = { - path: previous_path - } - - - Gitlab::Git::Blob.remove(raw_repository, options) - end - options[:file] = { content: content, path: path, update: update } - Gitlab::Git::Blob.commit(raw_repository, options) + if previous_path + options[:file].merge!(previous_path: previous_path) + + puts "#" * 90 + puts "Hello" + puts "#" * 90 + Gitlab::Git::Blob.rename(raw_repository, options) + else + puts "#" * 90 + puts "World" + puts "#" * 90 + Gitlab::Git::Blob.commit(raw_repository, options) + end end end -- GitLab From b1c44837df8eef373bc162baf809e8c911cf8941 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 101/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From fbde82b58799a75ba367836f4222170588ab7c5d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 102/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From e621fb57c4c40bc05cfc2c88a1a7b2493cafc2f4 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 103/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 36f51da8875c..e8a187462163 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -751,9 +751,6 @@ def update_file(user, path, previous_path, content, message, branch, update) if previous_path options[:file].merge!(previous_path: previous_path) - puts "#" * 90 - puts "Hello" - puts "#" * 90 Gitlab::Git::Blob.rename(raw_repository, options) else puts "#" * 90 -- GitLab From 71bab5fe58e6b408c67ea681cba371459ae40e7b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 104/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- app/controllers/concerns/creates_commit.rb | 8 -------- app/models/repository.rb | 3 --- app/services/files/update_service.rb | 1 + 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 1fc1be9e2724..cce820fb53ad 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index d65616ad7665..3eaef2148755 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -401,7 +403,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) diff --git a/app/models/repository.rb b/app/models/repository.rb index e8a187462163..a391820a8ba9 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -753,9 +753,6 @@ def update_file(user, path, previous_path, content, message, branch, update) Gitlab::Git::Blob.rename(raw_repository, options) else - puts "#" * 90 - puts "World" - puts "#" * 90 Gitlab::Git::Blob.commit(raw_repository, options) end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index fefa1d4ef68f..41add13af50d 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end -- GitLab From 7503dc7fcf961258d291e22425705fe309627e46 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:07:16 +0100 Subject: [PATCH 105/183] adds change to CHANGELOG file --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index ee3ee4c37d60..d5052df2cbe2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.10.0 (unreleased) - Expose {should,force}_remove_source_branch (Ben Boeckel) + - Add the functionality to be able to rename a file. !5049 (tiagonbotelho) - Fix commit builds API, return all builds for all pipelines for given commit. !4849 - Replace Haml with Hamlit to make view rendering faster. !3666 - Expire the branch cache after `git gc` runs -- GitLab From 58031cadc88c7b2e75853eb7903de5225209d94f Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 106/183] refactors to pass values as arguments through options --- app/models/repository.rb | 27 ++++++++++++++------------- app/services/files/update_service.rb | 5 +++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index a391820a8ba9..d9c5ec817a01 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,29 +731,30 @@ def commit_file(user, path, content, message, branch, update) end end - def update_file(user, path, previous_path, content, message, branch, update) + # previous_path, message, update + def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - options = {} - options[:committer] = committer - options[:author] = committer - options[:commit] = { - message: message, - branch: ref, + commit_options = {} + commit_options[:committer] = committer + commit_options[:author] = committer + commit_options[:commit] = { + message: options[:message], + branch: ref } - options[:file] = { + commit_options[:file] = { content: content, path: path, - update: update + update: options[:update] } - if previous_path - options[:file].merge!(previous_path: previous_path) + if options[:previous_path] + commit_options[:file].merge!(previous_path: options[:previous_path]) - Gitlab::Git::Blob.rename(raw_repository, options) + Gitlab::Git::Blob.rename(raw_repository, commit_options) else - Gitlab::Git::Blob.commit(raw_repository, options) + Gitlab::Git::Blob.commit(raw_repository, commit_options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 41add13af50d..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,8 +3,9 @@ module Files class UpdateService < Files::BaseService def commit - - repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @file_content, + @target_branch, previous_path: @previous_path, + message: @commit_message, update: true) end end end -- GitLab From d914275cd48050197924e3c3371cdac414aa8d82 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 107/183] fixes issues for mr acceptance --- app/models/repository.rb | 2 +- app/views/projects/blob/_editor.html.haml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index d9c5ec817a01..39264726c9c1 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,7 +750,7 @@ def update_file(user, path, content, branch, options={}) } if options[:previous_path] - commit_options[:file].merge!(previous_path: options[:previous_path]) + commit_options[:file][:previous_path] = options[:previous_path] Gitlab::Git::Blob.rename(raw_repository, commit_options) else diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 3c64b2f5e96e..31bd4646d3dd 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,11 +4,9 @@ = icon('code-fork') = ref %span.editor-file-name - - if current_action?(:edit) && can?(current_user, :push_code, @project) - = text_field_tag 'file_name', params[:file_name], placeholder: @path, + -if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] or @path), class: 'form-control new-file-name' - - else - = @path - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 11bf8a81f4f8761494d5fc46d5ba72fe945562f7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 108/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 905c7a7c81ae..cbcbdafe21ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) -- GitLab From 4728b8697dfdb95d1c6a81e804d6faba61be9ee6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 109/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 600b3298dc6b7defc325f4d37069e72570635aa3 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 110/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From c95434320a3edc27638710e30fa5a64cb5626c21 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 111/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 3824f6fde8b29b77c7d88f8fcc3dd50420355b65 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 112/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From 840335ec8378ec71cc09f71e0e82d29198d909e4 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 113/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 1 - app/services/files/update_service.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 39264726c9c1..c0138514c0ff 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,7 +731,6 @@ def commit_file(user, path, content, message, branch, update) end end - # previous_path, message, update def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index cbcbdafe21ae..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,6 @@ module Files class UpdateService < Files::BaseService def commit - repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) -- GitLab From 494afb4e36ae1418e3f37eca2faead6535125b36 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 114/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 905c7a7c81ae..cbcbdafe21ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,6 +3,7 @@ module Files class UpdateService < Files::BaseService def commit + repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) -- GitLab From 94e98afcfeea8fe7df4f64b1042a6370915eed8d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 115/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From e5caeab441d6c0e818aec369ed467c0b8b9cc29a Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 116/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From ea577ddda314fc17c87f28e35115bcba0a8df8e6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 117/183] refactors blob_controller --- Gemfile | 4 ++++ Gemfile.lock | 19 +++++++++++++++++++ app/controllers/concerns/creates_commit.rb | 8 ++++++++ 3 files changed, 31 insertions(+) diff --git a/Gemfile b/Gemfile index cce820fb53ad..d97e6ab29db6 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,11 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +======= +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +>>>>>>> refactors blob_controller # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 3eaef2148755..1fc6b36379fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,12 @@ +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 branch: commit-blob-rename-action +======= +PATH + remote: ~/src/Gitlab/gitlab_git +>>>>>>> refactors blob_controller specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -285,11 +290,16 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a +======= +======= +>>>>>>> refactors blob_controller gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) >>>>>>> refactors blob_controller @@ -403,6 +413,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -875,8 +886,16 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (~> 10.2) +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a + gitlab_emoji (~> 0.3.0) +======= +======= gitlab_emoji (~> 0.3.0) + gitlab_git (~> 10.2)! +>>>>>>> refactors blob_controller +>>>>>>> refactors blob_controller gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 40c009537a90864a2085c0ffc309b73530ffd24b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 118/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From b81cb3ee4924c0a5710b52b8c07adb8b4d76b108 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 119/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From c4208b30b677f526b38aa44fa884312a63b88ca0 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 120/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index c0138514c0ff..73ea7f0af1ce 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -748,8 +748,8 @@ def update_file(user, path, content, branch, options={}) update: options[:update] } - if options[:previous_path] - commit_options[:file][:previous_path] = options[:previous_path] + if previous_path + options[:file].merge!(previous_path: previous_path) Gitlab::Git::Blob.rename(raw_repository, commit_options) else -- GitLab From 7759e86be51542b7a2850421f7ef377bb8dc5d5c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 121/183] removes debugging prints from code --- Gemfile | 4 ---- Gemfile.lock | 15 ++++++--------- app/controllers/concerns/creates_commit.rb | 8 -------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index d97e6ab29db6..1fc1be9e2724 100644 --- a/Gemfile +++ b/Gemfile @@ -52,11 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a -gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" -======= gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" ->>>>>>> refactors blob_controller # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 1fc6b36379fc..9c2f82ae1e9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,18 @@ +<<<<<<< c4208b30b677f526b38aa44fa884312a63b88ca0 <<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a +======= +>>>>>>> removes debugging prints from code GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 branch: commit-blob-rename-action +<<<<<<< c4208b30b677f526b38aa44fa884312a63b88ca0 ======= PATH remote: ~/src/Gitlab/gitlab_git >>>>>>> refactors blob_controller +======= +>>>>>>> removes debugging prints from code specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -413,7 +419,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -886,16 +891,8 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (~> 10.2) -<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a gitlab_emoji (~> 0.3.0) -======= -======= - gitlab_emoji (~> 0.3.0) - gitlab_git (~> 10.2)! ->>>>>>> refactors blob_controller ->>>>>>> refactors blob_controller gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) -- GitLab From d652fa5652f4e781c3944e5f26978de25a0e98f5 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 122/183] refactors to pass values as arguments through options --- app/models/repository.rb | 4 ++-- app/services/files/update_service.rb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 73ea7f0af1ce..80b83720d278 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -748,8 +748,8 @@ def update_file(user, path, content, branch, options={}) update: options[:update] } - if previous_path - options[:file].merge!(previous_path: previous_path) + if commit_options[:previous_path] + commit_options[:file].merge!(previous_path: commit_options[:previous_path]) Gitlab::Git::Blob.rename(raw_repository, commit_options) else diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index cbcbdafe21ae..905c7a7c81ae 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,6 @@ module Files class UpdateService < Files::BaseService def commit - repository.update_file(current_user, @file_path, @file_content, @target_branch, previous_path: @previous_path, message: @commit_message, update: true) -- GitLab From 908eabebc1117b53d811c8ba7f57b84735e37409 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 123/183] fixes issues for mr acceptance --- app/models/repository.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 80b83720d278..c0138514c0ff 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -748,8 +748,8 @@ def update_file(user, path, content, branch, options={}) update: options[:update] } - if commit_options[:previous_path] - commit_options[:file].merge!(previous_path: commit_options[:previous_path]) + if options[:previous_path] + commit_options[:file][:previous_path] = options[:previous_path] Gitlab::Git::Blob.rename(raw_repository, commit_options) else -- GitLab From 6a3d05a94bd5c1c821a588232e5b96b5581a0c3e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 14:35:56 +0100 Subject: [PATCH 124/183] fixes merge conflicts for Gemfile.lock --- Gemfile.lock | 169 +++++++++++++++++++++++++++++---------------------- 1 file changed, 95 insertions(+), 74 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9c2f82ae1e9d..03dcc3abdec3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ >>>>>>> removes debugging prints from code GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + revision: cfb423fb576590525c4a978bc21cc98917c3334c branch: commit-blob-rename-action <<<<<<< c4208b30b677f526b38aa44fa884312a63b88ca0 ======= @@ -79,14 +79,13 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - ast (2.2.0) + asciidoctor (1.5.4) + ast (2.3.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -110,7 +109,7 @@ GEM babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) - benchmark-ips (2.3.0) + benchmark-ips (2.6.1) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -122,13 +121,13 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.0.0) + bullet (5.1.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.9.0) + uniform_notifier (~> 1.10.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.5) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -136,7 +135,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.13) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -148,9 +147,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.6) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -160,15 +159,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.7.7) + colorize (0.8.1) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.1) + css_parser (1.4.5) addressable - d3_rails (3.5.11) + d3_rails (3.5.16) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -178,7 +177,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -195,7 +194,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.3) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -205,9 +204,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.0.8) - excon (0.49.0) - execjs (2.6.0) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -222,18 +221,21 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.10) - flay (2.6.1) + ffi (1.9.12) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.3.2) + flog (4.4.0) + path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.9.4) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -242,7 +244,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -255,8 +257,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.6) - fog-core (>= 1.39) + fog-openstack (0.1.7) + fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -267,9 +269,9 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.1.0) + font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.82.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.0.0) @@ -279,7 +281,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.0) + get_process_mem (0.2.1) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -296,6 +298,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< 908eabebc1117b53d811c8ba7f57b84735e37409 <<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (10.2.3) activesupport (~> 4.0) @@ -309,6 +312,8 @@ GEM gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) >>>>>>> refactors blob_controller +======= +>>>>>>> fixes merge conflicts for Gemfile.lock gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -317,7 +322,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.0) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -351,10 +356,17 @@ GEM temple (~> 0.7.6) thor tilt +<<<<<<< 908eabebc1117b53d811c8ba7f57b84735e37409 hashie (3.4.3) health_check (2.1.0) rails (>= 4.0) hipchat (1.5.2) +======= + hashie (3.4.4) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.3) +>>>>>>> fixes merge conflicts for Gemfile.lock httparty mimemagic html-pipeline (1.11.0) @@ -365,10 +377,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.7.0.1) + httpclient (2.8.0) i18n (0.7.0) - ice_nine (0.11.1) - influxdb (0.2.3) + ice_nine (0.11.2) + influxdb (0.3.5) cause json ipaddress (0.8.3) @@ -388,7 +400,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.11.1) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -399,7 +411,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (2.1.2) bundler httparty rubyzip @@ -407,9 +419,10 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -419,24 +432,30 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mime-types-data (3.2016.0521) + mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.3.21) nested_form (0.3.2) - net-ldap (0.12.1) - net-ssh (3.0.1) - newrelic_rpm (3.14.1.311) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) +<<<<<<< 908eabebc1117b53d811c8ba7f57b84735e37409 oauth (0.4.7) oauth2 (1.2.0) +======= + oauth (0.5.1) + oauth2 (1.0.0) +>>>>>>> fixes merge conflicts for Gemfile.lock faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) @@ -447,7 +466,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) + omniauth-auth0 (1.4.2) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -466,7 +485,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.4.1) @@ -501,10 +520,11 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) + paranoia (2.1.5) activerecord (~> 4.0) - parser (2.3.1.0) + parser (2.3.1.2) ast (~> 2.2) + path_expander (1.0.0) pg (0.18.4) pkg-config (1.1.7) poltergeist (1.9.0) @@ -514,10 +534,10 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.8.7) + css_parser (>= 1.4.5) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) + premailer-rails (1.9.4) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.3) @@ -535,7 +555,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.1) + rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -570,19 +590,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.16.0) rake (10.5.0) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.0.0) + recaptcha (3.3.0) json - redcarpet (3.3.3) - redis (3.2.2) + redcarpet (3.3.4) + redis (3.3.0) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -601,16 +621,16 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.0) + request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.0) - rqrcode (0.7.0) - chunky_png + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) @@ -649,12 +669,13 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.3.0) nokogiri (>= 1.5.10) + ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.5.2) + rubyntlm (0.6.0) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.1.10) + rufus-scheduler (3.2.1) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -678,7 +699,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -693,7 +714,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -727,7 +748,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -788,7 +809,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) unicorn (4.9.0) kgio (~> 2.6) rack @@ -796,7 +817,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.9.0) + uniform_notifier (1.10.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -816,7 +837,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -1017,4 +1038,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.10.6 -- GitLab From fc747dc34627c4bcb9fbb0ecab1440224f23ec88 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:36:22 +0100 Subject: [PATCH 125/183] fixes merge request edit bug where it would generate a cloned file and not remove the previous one --- Gemfile.lock | 1 - app/controllers/projects/blob_controller.rb | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 03dcc3abdec3..b87b288f71f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -432,7 +432,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4d8bb5be20bb..00549265e9e7 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,6 +38,11 @@ def edit end def update + unless params[:file_name].empty? + @previous_path = @path + @path = params[:file_name] + end + after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + -- GitLab From 1f105bdc04088d5c72f7d1a1732075a407f38cf0 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:51:02 +0100 Subject: [PATCH 126/183] fixes more issues for MR acceptance --- app/models/repository.rb | 24 +++++++++++------------ app/services/files/update_service.rb | 5 +++-- app/views/projects/blob/_editor.html.haml | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index c0138514c0ff..538d91a77d73 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -731,29 +731,29 @@ def commit_file(user, path, content, message, branch, update) end end - def update_file(user, path, content, branch, options={}) + def update_file(user, path, content, branch:, previous_path:, message:) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - commit_options = {} - commit_options[:committer] = committer - commit_options[:author] = committer - commit_options[:commit] = { - message: options[:message], + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, branch: ref } - commit_options[:file] = { + options[:file] = { content: content, path: path, - update: options[:update] + update: true } - if options[:previous_path] - commit_options[:file][:previous_path] = options[:previous_path] + if previous_path + options[:file][:previous_path] = previous_path - Gitlab::Git::Blob.rename(raw_repository, commit_options) + Gitlab::Git::Blob.rename(raw_repository, options) else - Gitlab::Git::Blob.commit(raw_repository, commit_options) + Gitlab::Git::Blob.commit(raw_repository, options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 905c7a7c81ae..8d2b5083179e 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,8 +4,9 @@ module Files class UpdateService < Files::BaseService def commit repository.update_file(current_user, @file_path, @file_content, - @target_branch, previous_path: @previous_path, - message: @commit_message, update: true) + branch: @target_branch, + previous_path: @previous_path, + message: @commit_message) end end end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 31bd4646d3dd..ad3009f30ab7 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -4,8 +4,8 @@ = icon('code-fork') = ref %span.editor-file-name - -if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] or @path), + - if current_action?(:edit) || current_action?(:update) + = text_field_tag 'file_name', (params[:file_name] || @path), class: 'form-control new-file-name' - if current_action?(:new) || current_action?(:create) -- GitLab From 4c1d00d044f91d3324918924a46cc4b3d0e3f172 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:04 +0100 Subject: [PATCH 127/183] removes the git path for the gitlab_git gem corresponding to this MR dependency --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1fc1be9e2724..cbcd9f20ace2 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes -- GitLab From 28c34301ae62cdc8f7c87dad87d80d97cdb8d379 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:33 +0100 Subject: [PATCH 128/183] removes Gemfile.lock --- Gemfile.lock | 1040 -------------------------------------------------- 1 file changed, 1040 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b87b288f71f6..000000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,1040 +0,0 @@ -<<<<<<< c4208b30b677f526b38aa44fa884312a63b88ca0 -<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a -======= ->>>>>>> removes debugging prints from code -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: cfb423fb576590525c4a978bc21cc98917c3334c - branch: commit-blob-rename-action -<<<<<<< c4208b30b677f526b38aa44fa884312a63b88ca0 -======= -PATH - remote: ~/src/Gitlab/gitlab_git ->>>>>>> refactors blob_controller -======= ->>>>>>> removes debugging prints from code - specs: - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - better_errors (1.0.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) - ffi (1.9.12) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) -<<<<<<< 908eabebc1117b53d811c8ba7f57b84735e37409 -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) -<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a -======= -======= ->>>>>>> refactors blob_controller - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) ->>>>>>> refactors blob_controller -======= ->>>>>>> fixes merge conflicts for Gemfile.lock - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt -<<<<<<< 908eabebc1117b53d811c8ba7f57b84735e37409 - hashie (3.4.3) - health_check (2.1.0) - rails (>= 4.0) - hipchat (1.5.2) -======= - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) ->>>>>>> fixes merge conflicts for Gemfile.lock - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) -<<<<<<< 908eabebc1117b53d811c8ba7f57b84735e37409 - oauth (0.4.7) - oauth2 (1.2.0) -======= - oauth (0.5.1) - oauth2 (1.0.0) ->>>>>>> fixes merge conflicts for Gemfile.lock - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.4.1) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue (~> 1.3.0) - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips (~> 2.3.0) - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet (~> 5.0.0) - bundler-audit (~> 0.5.0) - byebug (~> 8.2.1) - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay (~> 2.6.1) - flog (~> 4.3.2) - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman (~> 0.78.0) - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.2) - gitlab_emoji (~> 0.3.0) - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 2.1.0) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack (~> 1.11.0) - letter_opener_web (~> 1.3.0) - license_finder (~> 2.1.0) - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.2.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.4.1) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails (~> 0.3.4) - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof (~> 0.3.6) - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace (~> 1.5.2) - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry (~> 0.4.5) - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack (~> 1.3.6) - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.6 -- GitLab From 9cd65d345b4ccb70b56ba41795eb7649a81c8a77 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 10:40:10 +0100 Subject: [PATCH 129/183] adds Gemfile.lock to mr --- Gemfile.lock | 994 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 994 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..8809edb0fc98 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,994 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.3.0) + activerecord (>= 3.0) + akismet (2.0.0) + allocations (1.0.5) + arel (6.0.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.4) + ast (2.3.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) + execjs + awesome_print (1.2.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) + babosa (1.0.2) + base32 (0.3.2) + bcrypt (3.1.11) + benchmark-ips (2.6.1) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + brakeman (3.3.2) + browser (2.2.0) + builder (3.2.2) + bullet (5.1.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (9.0.5) + capybara (2.6.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.13) + capybara (>= 1.0, < 3) + launchy + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.6) + cliver (0.3.2) + coderay (1.1.1) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorize (0.8.1) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + creole (0.5.0) + css_parser (1.4.5) + addressable + d3_rails (3.5.16) + railties (>= 3.1.0) + daemons (1.2.3) + database_cleaner (1.4.1) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + default_value_for (3.0.1) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.2.5) + diffy (3.0.7) + docile (1.1.5) + doorkeeper (4.0.0) + railties (>= 4.2) + dropzonejs-rails (0.7.3) + rails (> 3.1) + email_reply_parser (0.5.8) + email_spec (1.6.0) + launchy (~> 2.1) + mail (~> 2.2) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) + expression_parser (0.9.0) + factory_girl (4.5.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) + railties (>= 3.0.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + ffaker (2.0.0) + ffi (1.9.13) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) + ruby_parser (~> 3.0) + sexp_processor (~> 4.0) + flog (4.4.0) + path_expander (~> 1.0) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aws (0.9.4) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.42.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-google (0.3.2) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.0) + fog-core (~> 1.27) + fog-openstack (0.1.7) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.6.3.1) + railties (>= 3.2, < 5.1) + foreman (0.82.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.6.1) + json + get_process_mem (0.2.1) + gherkin-ruby (0.3.2) + github-linguist (4.7.6) + charlock_holmes (~> 0.7.3) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.23.0b) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grit (2.8.1) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16, < 3) + posix-spawn (~> 0.3) + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.3) + globalid (0.3.6) + activesupport (>= 4.1.0) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) + gon (6.0.1) + actionpack (>= 3.0) + json + multi_json + request_store (>= 1.0) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + hamlit (2.5.0) + temple (~> 0.7.6) + thor + tilt + hashie (3.4.4) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.3) + httparty + mimemagic + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + htmlentities (4.3.4) + http_parser.rb (0.5.3) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.8.0) + i18n (0.7.0) + ice_nine (0.11.2) + influxdb (0.3.5) + cause + json + ipaddress (0.8.3) + jquery-atwho-rails (1.3.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + jwt (1.5.4) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.10.0) + knapsack (1.11.1) + rake + timecop (>= 0.1.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.2) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.1) + mini_portile2 (2.1.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + mysql2 (0.3.21) + nested_form (0.3.2) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + numerizer (0.1.1) + oauth (0.5.1) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (~> 1.2) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-auth0 (1.4.2) + omniauth-oauth2 (~> 1.1) + omniauth-azure-oauth2 (0.0.6) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-cas3 (1.1.3) + addressable (~> 2.3) + nokogiri (~> 1.6.6) + omniauth (~> 1.2) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-gitlab (1.0.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) + omniauth-shibboleth (1.2.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + paranoia (2.1.5) + activerecord (~> 4.0) + parser (2.3.1.2) + ast (~> 2.2) + path_expander (1.0.0) + pg (0.18.4) + pkg-config (1.1.7) + poltergeist (1.9.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + powerpack (0.1.1) + premailer (1.8.7) + css_parser (>= 1.4.5) + htmlentities (>= 4.0.0) + premailer-rails (1.9.4) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.3.1) + rack + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-oauth2 (1.2.3) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (2.1.0) + raindrops (0.16.0) + rake (10.5.0) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rdoc (3.12.2) + json (~> 1.4) + recaptcha (3.3.0) + json + redcarpet (3.3.4) + redis (3.3.0) + redis-actionpack (4.0.1) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.1.5) + activesupport (>= 3, < 5) + redis-store (~> 1.1.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.7) + redis (>= 2.2) + request_store (1.3.1) + rerun (0.11.0) + listen (~> 3.0) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) + nokogiri (>= 1.5.10) + ruby_dep (1.3.1) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) + rubyntlm (0.6.0) + rubypants (0.2.0) + rubyzip (1.2.0) + rufus-scheduler (3.2.1) + rugged (0.24.0) + safe_yaml (1.0.4) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.10) + thor (~> 0.14) + sentry-raven (1.1.0) + faraday (>= 0.7.6) + settingslogic (2.0.9) + sexp_processor (4.7.0) + sham_rack (1.3.6) + rack + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + sidekiq (4.1.4) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) + sidekiq-cron (0.4.2) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.0.0) + simple_oauth (0.1.9) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + six (0.2.0) + slack-notifier (1.2.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + spring-commands-spinach (1.1.0) + spring (>= 0.9.1) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) + state_machines-activemodel (>= 0.3.0) + stringex (2.5.2) + sys-filesystem (1.1.6) + ffi + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.7.7) + test_after_commit (0.4.2) + activerecord (>= 3.2) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) + twitter-stream (~> 0.1) + turbolinks (2.5.3) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + u2f (0.2.1) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.1.0) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.10.0) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.1.0) + warden (1.2.6) + rack (>= 1.0) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + wikicloth (0.8.1) + builder + expression_parser + rinku + xml-simple (1.1.5) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-session_store (~> 1.0.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + akismet (~> 2.0) + allocations (~> 1.0) + asana (~> 0.4.0) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 3.0.0) + awesome_print (~> 1.2.0) + babosa (~> 1.0.2) + base32 (~> 0.3.0) + benchmark-ips + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) + bootstrap-sass (~> 3.3.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet + bundler-audit + byebug + capybara (~> 2.6.2) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.10.0) + charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) + coffee-rails (~> 4.1.0) + connection_pool (~> 2.0) + creole (~> 0.5.0) + d3_rails (~> 3.5.0) + database_cleaner (~> 1.4.0) + default_value_for (~> 3.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) + diffy (~> 3.0.3) + doorkeeper (~> 4.0) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + factory_girl_rails (~> 4.6.0) + ffaker (~> 2.0.0) + flay + flog + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman + fuubar (~> 2.0.0) + gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) + github-linguist (~> 4.7.0) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab_git (~> 10.2) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.1.0) + gollum-rugged_adapter (~> 0.4.2) + gon (~> 6.0.1) + grape (~> 0.13.0) + grape-entity (~> 0.4.2) + hamlit (~> 2.5) + health_check (~> 1.5.1) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + influxdb (~> 0.2) + jquery-atwho-rails (~> 1.3.2) + jquery-rails (~> 4.1.0) + jquery-turbolinks (~> 2.1.0) + jquery-ui-rails (~> 5.0.0) + jwt + kaminari (~> 0.17.0) + knapsack + letter_opener_web (~> 1.3.0) + license_finder + licensee (~> 8.0.0) + loofah (~> 2.0.3) + mail_room (~> 0.8) + method_source (~> 0.8) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) + oauth2 (~> 1.0.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) + omniauth-azure-oauth2 (~> 0.0.6) + omniauth-bitbucket (~> 0.0.2) + omniauth-cas3 (~> 1.1.2) + omniauth-facebook (~> 3.0.0) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.0) + omniauth-kerberos (~> 0.3.0) + omniauth-saml (~> 1.6.0) + omniauth-shibboleth (~> 1.2.0) + omniauth-twitter (~> 1.2.0) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails + rack-attack (~> 4.3.1) + rack-cors (~> 0.4.0) + rack-oauth2 (~> 1.2.1) + rails (= 4.2.6) + rails-deprecated_sanitizer (~> 1.0.3) + rainbow (~> 2.1.0) + rblineprof + rdoc (~> 3.6) + recaptcha (~> 3.0) + redcarpet (~> 3.3.3) + redis (~> 3.2) + redis-namespace + redis-rails (~> 4.0.0) + request_store (~> 1.3.0) + rerun (~> 0.11.0) + responders (~> 2.0) + rouge (~> 1.11) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.5.0) + rspec-retry + rubocop (~> 0.40.0) + rubocop-rspec (~> 1.5.0) + ruby-fogbugz (~> 0.2.1) + sanitize (~> 2.0) + sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + sentry-raven (~> 1.1.0) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (~> 4.0) + sidekiq-cron (~> 0.4.0) + simplecov (~> 0.11.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.2.0) + spinach-rails (~> 0.2.1) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.1.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) + task_list (~> 1.0.2) + teaspoon (~> 1.1.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.4.2) + thin (~> 1.7.0) + tinder (~> 1.10.0) + turbolinks (~> 2.5.0) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + underscore-rails (~> 1.8.0) + unf (~> 0.1.4) + unicorn (~> 4.9.0) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + vmstat (~> 2.1.0) + web-console (~> 2.0) + webmock (~> 1.21.0) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.12.5 -- GitLab From 50613fc6d313bd08ef5c1499739863a45a2a9d32 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 130/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 00549265e9e7..8fc24668b42d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,6 +52,7 @@ def update @previous_path = @path @path = params[:file_name] end + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From 10954f93e9ca9a54d85228dddaeb0f4aaef25753 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 131/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/projects/blob_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 8fc24668b42d..00549265e9e7 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,7 +52,6 @@ def update @previous_path = @path @path = params[:file_name] end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From f85834bc9622abcac44152348d6af3bed270110a Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 132/183] remove prints and useless comments --- app/controllers/projects/blob_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 00549265e9e7..8fc24668b42d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,6 +52,7 @@ def update @previous_path = @path @path = params[:file_name] end + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From d9561118e8a2ab5f2a5543e2c8ef3bfb6a3505c9 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 133/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 8fc24668b42d..00549265e9e7 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,7 +52,6 @@ def update @previous_path = @path @path = params[:file_name] end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From 09194eebff2154d22ee6ae5a63ff5dea03cbfe73 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 134/183] successfully adds the new version with the updated name on the projects repo --- app/controllers/projects/blob_controller.rb | 1 + app/services/files/base_service.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 00549265e9e7..8fc24668b42d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,6 +52,7 @@ def update @previous_path = @path @path = params[:file_name] end + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 9d411f47c6b324d05686ee8cb819f03dde2b9302 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 135/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From fba72e1e0c80e1c799cb41105458c27dda813fcd Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 136/183] creates the update_file method in repository.rb and applies changes accordingly --- app/controllers/projects/blob_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 8fc24668b42d..00549265e9e7 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,7 +52,6 @@ def update @previous_path = @path @path = params[:file_name] end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From b0ce99f5b0774be7d55c68083c5bdb609e99b776 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 137/183] implements the form for renaming the new filename on the file edit page --- app/controllers/projects/blob_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 00549265e9e7..8fc24668b42d 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,6 +52,7 @@ def update @previous_path = @path @path = params[:file_name] end + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From 1be09264755410511772b07a455b929b000958cf Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 138/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 66468bd73385b31b3a4380c85264dfbe06542d79 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 139/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From a50322679c8aec2858992aeac558f857c98ae28e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 140/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++++++++---- app/controllers/concerns/creates_commit.rb | 8 ++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cbcd9f20ace2..1fc1be9e2724 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2' +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 8809edb0fc98..57f2b056c86a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +PATH + remote: ~/src/Gitlab/gitlab_git + specs: + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + GEM remote: https://rubygems.org/ specs: @@ -277,10 +286,8 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) + gitlab_emoji (0.3.1) + gemojione (~> 2.2, >= 2.2.1) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -392,7 +399,12 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) +<<<<<<< 66468bd73385b31b3a4380c85264dfbe06542d79 mimemagic (0.3.1) +======= + mime-types-data (3.2016.0521) + mimemagic (0.3.0) +>>>>>>> refactors blob_controller mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 6e40f5ba88b26a7771c6995c9db3b794fca9349c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 141/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 3ca21b0aa6b009463f074bee47b5fad894291a22 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 142/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From a343c0e697735eb0f47ad9b13088301c4fdcfe2c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 143/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/models/repository.rb b/app/models/repository.rb index 538d91a77d73..01a6bbb51108 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -739,15 +739,31 @@ def update_file(user, path, content, branch:, previous_path:, message:) options[:author] = committer options[:commit] = { message: message, +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 branch: ref } +======= + branch: ref, + } + + if previous_path + options[:file] = { + path: previous_path + } + + + Gitlab::Git::Blob.remove(raw_repository, options) + end + +>>>>>>> creates the update_file method in repository.rb and applies changes accordingly options[:file] = { content: content, path: path, update: true } +<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if previous_path options[:file][:previous_path] = previous_path -- GitLab From 2313b09bffac0d75b3c58571cd2eed8c5996ca20 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 144/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 11 ++++------- app/controllers/concerns/creates_commit.rb | 8 -------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 1fc1be9e2724..cce820fb53ad 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 57f2b056c86a..cca04efd660f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -399,12 +401,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) -<<<<<<< 66468bd73385b31b3a4380c85264dfbe06542d79 - mimemagic (0.3.1) -======= - mime-types-data (3.2016.0521) mimemagic (0.3.0) ->>>>>>> refactors blob_controller mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) -- GitLab From e7832d014a5eb4330f8568935345df844d3ee346 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 145/183] refactors to pass values as arguments through options --- app/models/repository.rb | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 01a6bbb51108..5f5634aafa20 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -734,42 +734,25 @@ def commit_file(user, path, content, message, branch, update) def update_file(user, path, content, branch:, previous_path:, message:) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - options = {} - options[:committer] = committer - options[:author] = committer - options[:commit] = { - message: message, -<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 + commit_options = {} + commit_options[:committer] = committer + commit_options[:author] = committer + commit_options[:commit] = { + message: options[:message], branch: ref } -======= - branch: ref, - } - - if previous_path - options[:file] = { - path: previous_path - } - - - Gitlab::Git::Blob.remove(raw_repository, options) - end - ->>>>>>> creates the update_file method in repository.rb and applies changes accordingly - options[:file] = { + commit_options[:file] = { content: content, path: path, update: true } -<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if previous_path options[:file][:previous_path] = previous_path - - Gitlab::Git::Blob.rename(raw_repository, options) + Gitlab::Git::Blob.rename(raw_repository, commit_options) else - Gitlab::Git::Blob.commit(raw_repository, options) + Gitlab::Git::Blob.commit(raw_repository, commit_options) end end end -- GitLab From e182b85029524376d84a04e10730953a5be9e46b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 146/183] fixes issues for mr acceptance --- app/models/repository.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/repository.rb b/app/models/repository.rb index 5f5634aafa20..990e2b30580f 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,6 +750,7 @@ def update_file(user, path, content, branch:, previous_path:, message:) if previous_path options[:file][:previous_path] = previous_path + Gitlab::Git::Blob.rename(raw_repository, commit_options) else Gitlab::Git::Blob.commit(raw_repository, commit_options) -- GitLab From 4b8ae8f5975f2a88d700fe3d8fcad7e5e960d28e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 147/183] implements the form for renaming the new filename on the file edit page --- app/views/projects/blob/_editor.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index ad3009f30ab7..8a22e9126244 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -7,7 +7,6 @@ - if current_action?(:edit) || current_action?(:update) = text_field_tag 'file_name', (params[:file_name] || @path), class: 'form-control new-file-name' - - if current_action?(:new) || current_action?(:create) %span.editor-file-name \/ -- GitLab From 278e3d08f4a39f7d1c9da256fafc9784e25b8d23 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 148/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 66dff311a86c7176dc744f5356f4148cc5de5cea Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 149/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From fa2f367a78ca802707cf464c2423fe64b8728be3 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 150/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From ef90b278e9840af412256b65d6caf402f99a9c36 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 151/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From da514fb9b5acdbd7a1b9f126909d30fe8dc1c53b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 152/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 990e2b30580f..5f5634aafa20 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,7 +750,6 @@ def update_file(user, path, content, branch:, previous_path:, message:) if previous_path options[:file][:previous_path] = previous_path - Gitlab::Git::Blob.rename(raw_repository, commit_options) else Gitlab::Git::Blob.commit(raw_repository, commit_options) -- GitLab From 73c9e9e261bcb0a6cdeab23260301c1453facb73 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 16:32:56 +0100 Subject: [PATCH 153/183] implements the form for renaming the new filename on the file edit page --- app/services/files/update_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 8d2b5083179e..c2af9b855b1e 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -7,6 +7,7 @@ def commit branch: @target_branch, previous_path: @previous_path, message: @commit_message) + end end end -- GitLab From 542b0b0e3af9b04c690b14aaecd7fac6ea5554b7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 154/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 9ee35e13f399bc9a6cc546cca0eed2572bbacfad Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 155/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From df3d1c1fb977153aae5cab4f97a322ef6236c4d1 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 16:46:37 +0100 Subject: [PATCH 156/183] refactors blob_controller --- Gemfile | 2 +- Gemfile.lock | 13 +++++++++---- app/controllers/concerns/creates_commit.rb | 8 ++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cce820fb53ad..1fc1be9e2724 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index cca04efd660f..630e947e8b08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,5 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 - branch: commit-blob-rename-action +PATH + remote: ~/src/Gitlab/gitlab_git specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -288,6 +286,11 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab_git (10.3.0) + gitlab_git (10.2.3) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) gitlab_meta (7.0) @@ -401,6 +404,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -876,6 +880,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_git (~> 10.2) + gitlab_emoji (~> 0.3.0) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a3731b45df0a 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) + puts "#" * 10 + puts @previous_path + puts "#" * 10 + result = service.new(@tree_edit_project, current_user, commit_params).execute + puts "#" * 30 + puts result[:status] + puts "#" * 30 + if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 5cb5309a4dab70e3b85640f125b1b70d5c8e3805 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:46:37 +0100 Subject: [PATCH 157/183] successfully adds the new version with the updated name on the projects repo --- app/services/files/base_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index c8e66555c820..7719c1819ec1 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,6 +16,8 @@ def execute params[:file_content] end + puts @file_path + # Validate parameters validate -- GitLab From 50dd8063909903f7965b9c9e11c0a0a0b0e9813b Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 1 Jul 2016 17:53:05 +0100 Subject: [PATCH 158/183] remove prints and useless comments --- app/services/files/base_service.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb index 7719c1819ec1..c8e66555c820 100644 --- a/app/services/files/base_service.rb +++ b/app/services/files/base_service.rb @@ -16,8 +16,6 @@ def execute params[:file_content] end - puts @file_path - # Validate parameters validate -- GitLab From da7dc3864f86b56219b9ec46f584ce05b327611f Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 4 Jul 2016 11:32:57 +0100 Subject: [PATCH 159/183] creates the update_file method in repository.rb and applies changes accordingly --- app/models/repository.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/repository.rb b/app/models/repository.rb index 5f5634aafa20..990e2b30580f 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,6 +750,7 @@ def update_file(user, path, content, branch:, previous_path:, message:) if previous_path options[:file][:previous_path] = previous_path + Gitlab::Git::Blob.rename(raw_repository, commit_options) else Gitlab::Git::Blob.commit(raw_repository, commit_options) -- GitLab From 3beb55c659bc4f24c1cd34ed1b56925d528e7256 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 5 Jul 2016 09:46:48 +0100 Subject: [PATCH 160/183] removes debugging prints from code --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- app/controllers/concerns/creates_commit.rb | 8 -------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 1fc1be9e2724..cce820fb53ad 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" +gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 630e947e8b08..f70fcae5ff2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ~/src/Gitlab/gitlab_git +GIT + remote: git@gitlab.com:gitlab-org/gitlab_git.git + revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + branch: commit-blob-rename-action specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -404,7 +406,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a3731b45df0a..036805306f25 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,16 +12,8 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ previous_path: @previous_path ) - puts "#" * 10 - puts @previous_path - puts "#" * 10 - result = service.new(@tree_edit_project, current_user, commit_params).execute - puts "#" * 30 - puts result[:status] - puts "#" * 30 - if result[:status] == :success update_flash_notice(success_notice) -- GitLab From 66c9a2db629e034db72aba939d71ca57be2984d7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 11:25:45 +0100 Subject: [PATCH 161/183] refactors to pass values as arguments through options --- app/services/files/update_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index c2af9b855b1e..aaac3da93556 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -8,6 +8,7 @@ def commit previous_path: @previous_path, message: @commit_message) + end end end -- GitLab From f2df78d17977c1e082d6e78dda1ba98e62097ebd Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 13:51:28 +0100 Subject: [PATCH 162/183] fixes issues for mr acceptance --- app/models/repository.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 990e2b30580f..5f5634aafa20 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -750,7 +750,6 @@ def update_file(user, path, content, branch:, previous_path:, message:) if previous_path options[:file][:previous_path] = previous_path - Gitlab::Git::Blob.rename(raw_repository, commit_options) else Gitlab::Git::Blob.commit(raw_repository, commit_options) -- GitLab From 161ab6d618c7b674a1606ef79d2756b9274e59d6 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 14:35:56 +0100 Subject: [PATCH 163/183] fixes merge conflicts for Gemfile.lock --- Gemfile.lock | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f70fcae5ff2a..a86612509aef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + revision: cfb423fb576590525c4a978bc21cc98917c3334c branch: commit-blob-rename-action specs: gitlab_git (10.3.0) @@ -210,7 +210,11 @@ GEM faraday_middleware multi_json ffaker (2.0.0) +<<<<<<< f2df78d17977c1e082d6e78dda1ba98e62097ebd ffi (1.9.13) +======= + ffi (1.9.12) +>>>>>>> fixes merge conflicts for Gemfile.lock flay (2.8.0) erubis (~> 2.7.0) path_expander (~> 1.0) @@ -287,7 +291,6 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.3.0) gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -406,7 +409,8 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mime-types-data (3.2016.0521) + mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -422,8 +426,18 @@ GEM mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) +<<<<<<< f2df78d17977c1e082d6e78dda1ba98e62097ebd + oauth (0.5.1) + oauth2 (1.0.0) +======= +<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 + oauth (0.4.7) + oauth2 (1.2.0) +======= oauth (0.5.1) oauth2 (1.0.0) +>>>>>>> fixes merge conflicts for Gemfile.lock +>>>>>>> fixes merge conflicts for Gemfile.lock faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) @@ -880,8 +894,12 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) +<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 gitlab_git (~> 10.2) gitlab_emoji (~> 0.3.0) +======= + gitlab_git (~> 10.2)! +>>>>>>> fixes merge conflicts for Gemfile.lock gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) @@ -1006,4 +1024,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.10.6 -- GitLab From 4deab9a5406cadcdb16870f81dea1a6f41787af3 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:36:22 +0100 Subject: [PATCH 164/183] fixes merge request edit bug where it would generate a cloned file and not remove the previous one --- Gemfile.lock | 1 - app/controllers/projects/blob_controller.rb | 5 ----- 2 files changed, 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a86612509aef..efd15fa1d93d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -409,7 +409,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 8fc24668b42d..091b661a09f6 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -48,11 +48,6 @@ def update diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + "#file-path-#{hexdigest(@path)}" else - unless params[:file_name].empty? - @previous_path = @path - @path = params[:file_name] - end - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end -- GitLab From 4025c7f099c6ad4de832567443dce4e39d543e76 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 6 Jul 2016 18:51:02 +0100 Subject: [PATCH 165/183] fixes more issues for MR acceptance --- app/models/repository.rb | 16 ++++++++-------- app/services/files/update_service.rb | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 5f5634aafa20..affd21de9244 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -734,15 +734,15 @@ def commit_file(user, path, content, message, branch, update) def update_file(user, path, content, branch:, previous_path:, message:) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - commit_options = {} - commit_options[:committer] = committer - commit_options[:author] = committer - commit_options[:commit] = { - message: options[:message], + options = {} + options[:committer] = committer + options[:author] = committer + options[:commit] = { + message: message, branch: ref } - commit_options[:file] = { + options[:file] = { content: content, path: path, update: true @@ -750,9 +750,9 @@ def update_file(user, path, content, branch:, previous_path:, message:) if previous_path options[:file][:previous_path] = previous_path - Gitlab::Git::Blob.rename(raw_repository, commit_options) + Gitlab::Git::Blob.rename(raw_repository, options) else - Gitlab::Git::Blob.commit(raw_repository, commit_options) + Gitlab::Git::Blob.commit(raw_repository, options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index aaac3da93556..8d2b5083179e 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -7,8 +7,6 @@ def commit branch: @target_branch, previous_path: @previous_path, message: @commit_message) - - end end end -- GitLab From 7a48fb129ae0e12ab101f85a949577046e4e4b6c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:04 +0100 Subject: [PATCH 166/183] removes the git path for the gitlab_git gem corresponding to this MR dependency --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index cce820fb53ad..cbcd9f20ace2 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +gem "gitlab_git", '~> 10.2' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes -- GitLab From dc88ae248d7e24f4f3e39154f9b2cfbeae19961c Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Thu, 7 Jul 2016 11:07:33 +0100 Subject: [PATCH 167/183] removes Gemfile.lock --- Gemfile.lock | 1026 -------------------------------------------------- 1 file changed, 1026 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index efd15fa1d93d..000000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,1026 +0,0 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: cfb423fb576590525c4a978bc21cc98917c3334c - branch: commit-blob-rename-action - specs: - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - better_errors (1.0.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) -<<<<<<< f2df78d17977c1e082d6e78dda1ba98e62097ebd - ffi (1.9.13) -======= - ffi (1.9.12) ->>>>>>> fixes merge conflicts for Gemfile.lock - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) -<<<<<<< f2df78d17977c1e082d6e78dda1ba98e62097ebd - oauth (0.5.1) - oauth2 (1.0.0) -======= -<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 - oauth (0.4.7) - oauth2 (1.2.0) -======= - oauth (0.5.1) - oauth2 (1.0.0) ->>>>>>> fixes merge conflicts for Gemfile.lock ->>>>>>> fixes merge conflicts for Gemfile.lock - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (~> 1.2) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet - bundler-audit - byebug - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay - flog - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) -<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 - gitlab_git (~> 10.2) - gitlab_emoji (~> 0.3.0) -======= - gitlab_git (~> 10.2)! ->>>>>>> fixes merge conflicts for Gemfile.lock - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 1.5.1) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack - letter_opener_web (~> 1.3.0) - license_finder - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.0.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.6 -- GitLab From 8f67d970af8cd290ee95a3edb02badc589643e72 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 10:40:10 +0100 Subject: [PATCH 168/183] adds Gemfile.lock to mr --- Gemfile.lock | 994 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 994 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..8809edb0fc98 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,994 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.3.0) + activerecord (>= 3.0) + akismet (2.0.0) + allocations (1.0.5) + arel (6.0.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.4) + ast (2.3.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) + execjs + awesome_print (1.2.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) + babosa (1.0.2) + base32 (0.3.2) + bcrypt (3.1.11) + benchmark-ips (2.6.1) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + brakeman (3.3.2) + browser (2.2.0) + builder (3.2.2) + bullet (5.1.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (9.0.5) + capybara (2.6.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.13) + capybara (>= 1.0, < 3) + launchy + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.6) + cliver (0.3.2) + coderay (1.1.1) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorize (0.8.1) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + creole (0.5.0) + css_parser (1.4.5) + addressable + d3_rails (3.5.16) + railties (>= 3.1.0) + daemons (1.2.3) + database_cleaner (1.4.1) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + default_value_for (3.0.1) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.2.5) + diffy (3.0.7) + docile (1.1.5) + doorkeeper (4.0.0) + railties (>= 4.2) + dropzonejs-rails (0.7.3) + rails (> 3.1) + email_reply_parser (0.5.8) + email_spec (1.6.0) + launchy (~> 2.1) + mail (~> 2.2) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) + expression_parser (0.9.0) + factory_girl (4.5.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) + railties (>= 3.0.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + ffaker (2.0.0) + ffi (1.9.13) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) + ruby_parser (~> 3.0) + sexp_processor (~> 4.0) + flog (4.4.0) + path_expander (~> 1.0) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aws (0.9.4) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.42.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-google (0.3.2) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.0) + fog-core (~> 1.27) + fog-openstack (0.1.7) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.6.3.1) + railties (>= 3.2, < 5.1) + foreman (0.82.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.6.1) + json + get_process_mem (0.2.1) + gherkin-ruby (0.3.2) + github-linguist (4.7.6) + charlock_holmes (~> 0.7.3) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.23.0b) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grit (2.8.1) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16, < 3) + posix-spawn (~> 0.3) + gitlab_git (10.3.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.3) + globalid (0.3.6) + activesupport (>= 4.1.0) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) + gon (6.0.1) + actionpack (>= 3.0) + json + multi_json + request_store (>= 1.0) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + hamlit (2.5.0) + temple (~> 0.7.6) + thor + tilt + hashie (3.4.4) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.3) + httparty + mimemagic + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + htmlentities (4.3.4) + http_parser.rb (0.5.3) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.8.0) + i18n (0.7.0) + ice_nine (0.11.2) + influxdb (0.3.5) + cause + json + ipaddress (0.8.3) + jquery-atwho-rails (1.3.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + jwt (1.5.4) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.10.0) + knapsack (1.11.1) + rake + timecop (>= 0.1.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.2) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) + nokogiri (>= 1.5.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.1) + mini_portile2 (2.1.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + mysql2 (0.3.21) + nested_form (0.3.2) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + numerizer (0.1.1) + oauth (0.5.1) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (~> 1.2) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-auth0 (1.4.2) + omniauth-oauth2 (~> 1.1) + omniauth-azure-oauth2 (0.0.6) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-cas3 (1.1.3) + addressable (~> 2.3) + nokogiri (~> 1.6.6) + omniauth (~> 1.2) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-gitlab (1.0.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) + omniauth-shibboleth (1.2.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + paranoia (2.1.5) + activerecord (~> 4.0) + parser (2.3.1.2) + ast (~> 2.2) + path_expander (1.0.0) + pg (0.18.4) + pkg-config (1.1.7) + poltergeist (1.9.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + powerpack (0.1.1) + premailer (1.8.7) + css_parser (>= 1.4.5) + htmlentities (>= 4.0.0) + premailer-rails (1.9.4) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.3.1) + rack + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-oauth2 (1.2.3) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (2.1.0) + raindrops (0.16.0) + rake (10.5.0) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rdoc (3.12.2) + json (~> 1.4) + recaptcha (3.3.0) + json + redcarpet (3.3.4) + redis (3.3.0) + redis-actionpack (4.0.1) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.1.5) + activesupport (>= 3, < 5) + redis-store (~> 1.1.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.7) + redis (>= 2.2) + request_store (1.3.1) + rerun (0.11.0) + listen (~> 3.0) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) + nokogiri (>= 1.5.10) + ruby_dep (1.3.1) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) + rubyntlm (0.6.0) + rubypants (0.2.0) + rubyzip (1.2.0) + rufus-scheduler (3.2.1) + rugged (0.24.0) + safe_yaml (1.0.4) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.10) + thor (~> 0.14) + sentry-raven (1.1.0) + faraday (>= 0.7.6) + settingslogic (2.0.9) + sexp_processor (4.7.0) + sham_rack (1.3.6) + rack + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + sidekiq (4.1.4) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) + sidekiq-cron (0.4.2) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.0.0) + simple_oauth (0.1.9) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + six (0.2.0) + slack-notifier (1.2.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + spring-commands-spinach (1.1.0) + spring (>= 0.9.1) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) + state_machines-activemodel (>= 0.3.0) + stringex (2.5.2) + sys-filesystem (1.1.6) + ffi + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.7.7) + test_after_commit (0.4.2) + activerecord (>= 3.2) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) + twitter-stream (~> 0.1) + turbolinks (2.5.3) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + u2f (0.2.1) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.1.0) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.10.0) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.1.0) + warden (1.2.6) + rack (>= 1.0) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + wikicloth (0.8.1) + builder + expression_parser + rinku + xml-simple (1.1.5) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-session_store (~> 1.0.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + akismet (~> 2.0) + allocations (~> 1.0) + asana (~> 0.4.0) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 3.0.0) + awesome_print (~> 1.2.0) + babosa (~> 1.0.2) + base32 (~> 0.3.0) + benchmark-ips + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) + bootstrap-sass (~> 3.3.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet + bundler-audit + byebug + capybara (~> 2.6.2) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.10.0) + charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) + coffee-rails (~> 4.1.0) + connection_pool (~> 2.0) + creole (~> 0.5.0) + d3_rails (~> 3.5.0) + database_cleaner (~> 1.4.0) + default_value_for (~> 3.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) + diffy (~> 3.0.3) + doorkeeper (~> 4.0) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + factory_girl_rails (~> 4.6.0) + ffaker (~> 2.0.0) + flay + flog + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman + fuubar (~> 2.0.0) + gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) + github-linguist (~> 4.7.0) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab_git (~> 10.2) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.1.0) + gollum-rugged_adapter (~> 0.4.2) + gon (~> 6.0.1) + grape (~> 0.13.0) + grape-entity (~> 0.4.2) + hamlit (~> 2.5) + health_check (~> 1.5.1) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + influxdb (~> 0.2) + jquery-atwho-rails (~> 1.3.2) + jquery-rails (~> 4.1.0) + jquery-turbolinks (~> 2.1.0) + jquery-ui-rails (~> 5.0.0) + jwt + kaminari (~> 0.17.0) + knapsack + letter_opener_web (~> 1.3.0) + license_finder + licensee (~> 8.0.0) + loofah (~> 2.0.3) + mail_room (~> 0.8) + method_source (~> 0.8) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) + oauth2 (~> 1.0.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) + omniauth-azure-oauth2 (~> 0.0.6) + omniauth-bitbucket (~> 0.0.2) + omniauth-cas3 (~> 1.1.2) + omniauth-facebook (~> 3.0.0) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.0) + omniauth-kerberos (~> 0.3.0) + omniauth-saml (~> 1.6.0) + omniauth-shibboleth (~> 1.2.0) + omniauth-twitter (~> 1.2.0) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails + rack-attack (~> 4.3.1) + rack-cors (~> 0.4.0) + rack-oauth2 (~> 1.2.1) + rails (= 4.2.6) + rails-deprecated_sanitizer (~> 1.0.3) + rainbow (~> 2.1.0) + rblineprof + rdoc (~> 3.6) + recaptcha (~> 3.0) + redcarpet (~> 3.3.3) + redis (~> 3.2) + redis-namespace + redis-rails (~> 4.0.0) + request_store (~> 1.3.0) + rerun (~> 0.11.0) + responders (~> 2.0) + rouge (~> 1.11) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.5.0) + rspec-retry + rubocop (~> 0.40.0) + rubocop-rspec (~> 1.5.0) + ruby-fogbugz (~> 0.2.1) + sanitize (~> 2.0) + sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + sentry-raven (~> 1.1.0) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (~> 4.0) + sidekiq-cron (~> 0.4.0) + simplecov (~> 0.11.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.2.0) + spinach-rails (~> 0.2.1) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.1.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) + task_list (~> 1.0.2) + teaspoon (~> 1.1.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.4.2) + thin (~> 1.7.0) + tinder (~> 1.10.0) + turbolinks (~> 2.5.0) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + underscore-rails (~> 1.8.0) + unf (~> 0.1.4) + unicorn (~> 4.9.0) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + vmstat (~> 2.1.0) + web-console (~> 2.0) + webmock (~> 1.21.0) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.12.5 -- GitLab From 82dd0ab5bf08326f40e635f03357eff5b220d751 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 13:07:43 +0100 Subject: [PATCH 169/183] removes Gemfile.lock from project --- Gemfile.lock | 994 --------------------------------------------------- 1 file changed, 994 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 8809edb0fc98..000000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,994 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - better_errors (1.0.1) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) - ffi (1.9.13) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) - oauth (0.5.1) - oauth2 (1.0.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (~> 1.2) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet - bundler-audit - byebug - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay - flog - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.2) - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 1.5.1) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack - letter_opener_web (~> 1.3.0) - license_finder - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.0.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.12.5 -- GitLab From e167c94123fce673084cb641962c97e02d70bd91 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Fri, 8 Jul 2016 13:41:26 +0100 Subject: [PATCH 170/183] adds Gemfile.lock --- Gemfile.lock | 989 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 989 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000000..055596b056f8 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,989 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.3.0) + activerecord (>= 3.0) + akismet (2.0.0) + allocations (1.0.5) + arel (6.0.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.3) + ast (2.2.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) + attr_required (1.0.0) + autoprefixer-rails (6.2.3) + execjs + json + awesome_print (1.2.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) + babosa (1.0.2) + base32 (0.3.2) + bcrypt (3.1.11) + benchmark-ips (2.3.0) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + brakeman (3.3.2) + browser (2.2.0) + builder (3.2.2) + bullet (5.0.0) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.9.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (8.2.1) + capybara (2.6.2) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.11) + capybara (>= 1.0, < 3) + launchy + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.5) + cliver (0.3.2) + coderay (1.1.0) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + colorize (0.7.7) + concurrent-ruby (1.0.2) + connection_pool (2.2.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) + creole (0.5.0) + css_parser (1.4.1) + addressable + d3_rails (3.5.11) + railties (>= 3.1.0) + daemons (1.2.3) + database_cleaner (1.4.1) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + default_value_for (3.0.1) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (4.1.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.2.5) + diffy (3.0.7) + docile (1.1.5) + doorkeeper (4.0.0) + railties (>= 4.2) + dropzonejs-rails (0.7.2) + rails (> 3.1) + email_reply_parser (0.5.8) + email_spec (1.6.0) + launchy (~> 2.1) + mail (~> 2.2) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + eventmachine (1.0.8) + excon (0.49.0) + execjs (2.6.0) + expression_parser (0.9.0) + factory_girl (4.5.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) + railties (>= 3.0.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + ffaker (2.0.0) + ffi (1.9.10) + flay (2.6.1) + ruby_parser (~> 3.0) + sexp_processor (~> 4.0) + flog (4.3.2) + ruby_parser (~> 3.1, > 3.1.0) + sexp_processor (~> 4.4) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aws (0.9.2) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.40.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-google (0.3.2) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.0) + fog-core (~> 1.27) + fog-openstack (0.1.6) + fog-core (>= 1.39) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.6.1.0) + railties (>= 3.2, < 5.1) + foreman (0.78.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.6.1) + json + get_process_mem (0.2.0) + gherkin-ruby (0.3.2) + github-linguist (4.7.6) + charlock_holmes (~> 0.7.3) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.23.0b) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grit (2.8.1) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16, < 3) + posix-spawn (~> 0.3) + gitlab_git (10.2.3) + activesupport (~> 4.0) + charlock_holmes (~> 0.7.3) + github-linguist (~> 4.7.0) + rugged (~> 0.24.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.3) + globalid (0.3.6) + activesupport (>= 4.1.0) + gollum-grit_adapter (1.0.0) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) + gon (6.0.1) + actionpack (>= 3.0) + json + multi_json + request_store (>= 1.0) + grape (0.13.0) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.8) + activesupport + multi_json (>= 1.3.2) + hamlit (2.5.0) + temple (~> 0.7.6) + thor + tilt + hashie (3.4.3) + health_check (1.5.1) + rails (>= 2.3.0) + hipchat (1.5.2) + httparty + mimemagic + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + htmlentities (4.3.4) + http_parser.rb (0.5.3) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.7.0.1) + i18n (0.7.0) + ice_nine (0.11.1) + influxdb (0.2.3) + cause + json + ipaddress (0.8.3) + jquery-atwho-rails (1.3.2) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (1.8.3) + jwt (1.5.4) + kaminari (0.17.0) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.10.0) + knapsack (1.11.0) + rake + timecop (>= 0.1.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.0) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) + listen (3.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + loofah (2.0.3) + nokogiri (>= 1.5.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.0) + mini_portile2 (2.1.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + mysql2 (0.3.20) + nested_form (0.3.2) + net-ldap (0.12.1) + net-ssh (3.0.1) + newrelic_rpm (3.14.1.311) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + numerizer (0.1.1) + oauth (0.4.7) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) + omniauth-auth0 (1.4.1) + omniauth-oauth2 (~> 1.1) + omniauth-azure-oauth2 (0.0.6) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-cas3 (1.1.3) + addressable (~> 2.3) + nokogiri (~> 1.6.6) + omniauth (~> 1.2) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.1.2) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-gitlab (1.0.1) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) + omniauth-shibboleth (1.2.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + paranoia (2.1.4) + activerecord (~> 4.0) + parser (2.3.1.0) + ast (~> 2.2) + pg (0.18.4) + pkg-config (1.1.7) + poltergeist (1.9.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + powerpack (0.1.1) + premailer (1.8.6) + css_parser (>= 1.3.6) + htmlentities (>= 4.0.0) + premailer-rails (1.9.2) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.4) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.3.1) + rack + rack-cors (0.4.0) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-oauth2 (1.2.1) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (2.1.0) + raindrops (0.15.0) + rake (10.5.0) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rdoc (3.12.2) + json (~> 1.4) + recaptcha (3.0.0) + json + redcarpet (3.3.3) + redis (3.2.2) + redis-actionpack (4.0.1) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.1.5) + activesupport (>= 3, < 5) + redis-store (~> 1.1.0) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.7) + redis (>= 2.2) + request_store (1.3.0) + rerun (0.11.0) + listen (~> 3.0) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (1.11.0) + rqrcode (0.7.0) + chunky_png + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.0) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) + nokogiri (>= 1.5.10) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) + rubyntlm (0.5.2) + rubypants (0.2.0) + rubyzip (1.2.0) + rufus-scheduler (3.1.10) + rugged (0.24.0) + safe_yaml (1.0.4) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.9.3) + thor (~> 0.14) + sentry-raven (1.1.0) + faraday (>= 0.7.6) + settingslogic (2.0.9) + sexp_processor (4.7.0) + sham_rack (1.3.6) + rack + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + sidekiq (4.1.4) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) + sidekiq-cron (0.4.0) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.0.0) + simple_oauth (0.1.9) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + six (0.2.0) + slack-notifier (1.2.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + spring-commands-spinach (1.1.0) + spring (>= 0.9.1) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (3.6.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + state_machines (0.4.0) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) + state_machines (>= 0.4.0) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) + state_machines-activemodel (>= 0.3.0) + stringex (2.5.2) + sys-filesystem (1.1.6) + ffi + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.7.7) + test_after_commit (0.4.2) + activerecord (>= 3.2) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + tinder (1.10.1) + eventmachine (~> 1.0) + faraday (~> 0.9.0) + faraday_middleware (~> 0.9) + hashie (>= 1.0) + json (~> 1.8.0) + mime-types + multi_json (~> 1.7) + twitter-stream (~> 0.1) + turbolinks (2.5.3) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + u2f (0.2.1) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.0.5) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.9.0) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.1.0) + warden (1.2.6) + rack (>= 1.0) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket-driver (0.6.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + wikicloth (0.8.1) + builder + expression_parser + rinku + xml-simple (1.1.5) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-session_store (~> 1.0.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + akismet (~> 2.0) + allocations (~> 1.0) + asana (~> 0.4.0) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 3.0.0) + awesome_print (~> 1.2.0) + babosa (~> 1.0.2) + base32 (~> 0.3.0) + benchmark-ips + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) + bootstrap-sass (~> 3.3.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet + bundler-audit + byebug + capybara (~> 2.6.2) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.10.0) + charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) + coffee-rails (~> 4.1.0) + connection_pool (~> 2.0) + creole (~> 0.5.0) + d3_rails (~> 3.5.0) + database_cleaner (~> 1.4.0) + default_value_for (~> 3.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) + diffy (~> 3.0.3) + doorkeeper (~> 4.0) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + factory_girl_rails (~> 4.6.0) + ffaker (~> 2.0.0) + flay + flog + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman + fuubar (~> 2.0.0) + gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) + github-linguist (~> 4.7.0) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab_git (~> 10.2) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.1.0) + gollum-rugged_adapter (~> 0.4.2) + gon (~> 6.0.1) + grape (~> 0.13.0) + grape-entity (~> 0.4.2) + hamlit (~> 2.5) + health_check (~> 1.5.1) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + influxdb (~> 0.2) + jquery-atwho-rails (~> 1.3.2) + jquery-rails (~> 4.1.0) + jquery-turbolinks (~> 2.1.0) + jquery-ui-rails (~> 5.0.0) + jwt + kaminari (~> 0.17.0) + knapsack + letter_opener_web (~> 1.3.0) + license_finder + licensee (~> 8.0.0) + loofah (~> 2.0.3) + mail_room (~> 0.8) + method_source (~> 0.8) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) + nokogiri (~> 1.6.7, >= 1.6.7.2) + oauth2 (~> 1.2.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) + omniauth-azure-oauth2 (~> 0.0.6) + omniauth-bitbucket (~> 0.0.2) + omniauth-cas3 (~> 1.1.2) + omniauth-facebook (~> 3.0.0) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.0) + omniauth-kerberos (~> 0.3.0) + omniauth-saml (~> 1.6.0) + omniauth-shibboleth (~> 1.2.0) + omniauth-twitter (~> 1.2.0) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails + rack-attack (~> 4.3.1) + rack-cors (~> 0.4.0) + rack-oauth2 (~> 1.2.1) + rails (= 4.2.6) + rails-deprecated_sanitizer (~> 1.0.3) + rainbow (~> 2.1.0) + rblineprof + rdoc (~> 3.6) + recaptcha (~> 3.0) + redcarpet (~> 3.3.3) + redis (~> 3.2) + redis-namespace + redis-rails (~> 4.0.0) + request_store (~> 1.3.0) + rerun (~> 0.11.0) + responders (~> 2.0) + rouge (~> 1.11) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.5.0) + rspec-retry + rubocop (~> 0.40.0) + rubocop-rspec (~> 1.5.0) + ruby-fogbugz (~> 0.2.1) + sanitize (~> 2.0) + sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + sentry-raven (~> 1.1.0) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (~> 4.0) + sidekiq-cron (~> 0.4.0) + simplecov (~> 0.11.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.2.0) + spinach-rails (~> 0.2.1) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.1.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) + task_list (~> 1.0.2) + teaspoon (~> 1.1.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.4.2) + thin (~> 1.7.0) + tinder (~> 1.10.0) + turbolinks (~> 2.5.0) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + underscore-rails (~> 1.8.0) + unf (~> 0.1.4) + unicorn (~> 4.9.0) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + vmstat (~> 2.1.0) + web-console (~> 2.0) + webmock (~> 1.21.0) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.12.5 -- GitLab From cf96c7596a80296abffe8ad75303cc964d72ee5d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 11 Jul 2016 17:11:16 +0100 Subject: [PATCH 171/183] changes the usasge of path to file_path on blob_controller for compatibillity with the create action --- app/controllers/concerns/creates_commit.rb | 2 +- app/controllers/projects/blob_controller.rb | 8 ++++---- app/views/projects/blob/_editor.html.haml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25..a76fcd61b526 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,7 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @path, + file_path: @file_path, previous_path: @previous_path ) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 091b661a09f6..fb6ddd0e51d6 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -39,16 +39,16 @@ def edit def update unless params[:file_name].empty? - @previous_path = @path - @path = params[:file_name] + @previous_path = @file_path + @file_path = params[:file_name] end after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@path)}" + "#file-path-#{hexdigest(@file_path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) end create_commit(Files::UpdateService, success_path: after_edit_path, diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 8a22e9126244..e920f35879f1 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -5,7 +5,7 @@ = ref %span.editor-file-name - if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] || @path), + = text_field_tag 'file_name', (params[:file_name] || @file_path), class: 'form-control new-file-name' - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 893f3f28562c45da796ac5674600fd368bb3dbdf Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 11:49:21 +0100 Subject: [PATCH 172/183] refactors update action to change commit_params with the correct path --- Gemfile.lock | 2 +- app/controllers/concerns/creates_commit.rb | 1 - app/controllers/projects/blob_controller.rb | 9 +++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 055596b056f8..199ee6849701 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.2.3) + gitlab_git (10.3.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index a76fcd61b526..f2b8f297bc27 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -8,7 +8,6 @@ def create_commit(service, success_path:, failure_path:, failure_view: nil, succ source_project: @project, source_branch: @ref, target_branch: @target_branch, - file_path: @file_path, previous_path: @previous_path ) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index fb6ddd0e51d6..ac1141b8613e 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -39,16 +39,17 @@ def edit def update unless params[:file_name].empty? - @previous_path = @file_path - @file_path = params[:file_name] + @previous_path = @path + @path = params[:file_name] + @commit_params[:file_path] = @path end after_edit_path = if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@file_path)}" + "#file-path-#{hexdigest(@path)}" else - namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) + namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end create_commit(Files::UpdateService, success_path: after_edit_path, -- GitLab From 98c0eb461596e2b390ea5d43fc2f5f5284d1d0c0 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 12:48:24 +0100 Subject: [PATCH 173/183] test for nil params :file_name --- app/controllers/projects/blob_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index ac1141b8613e..0120ad8e0582 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,7 +38,7 @@ def edit end def update - unless params[:file_name].empty? + unless params[:file_name].nil? || params[:file_name].empty? @previous_path = @path @path = params[:file_name] @commit_params[:file_path] = @path -- GitLab From 4a7e1c64dc5ea834188ab0ad8886931cc7c9a8ef Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 16:10:27 +0100 Subject: [PATCH 174/183] restores gemfile.lock --- Gemfile.lock | 192 +++++++++++++++++++++++++-------------------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 199ee6849701..10bee450bffe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,14 +57,13 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - ast (2.2.0) + asciidoctor (1.5.4) + ast (2.3.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -106,7 +105,7 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (8.2.5) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -114,7 +113,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.13) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -126,9 +125,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.6) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -138,15 +137,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.7.7) + colorize (0.8.1) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.1) + css_parser (1.4.5) addressable - d3_rails (3.5.11) + d3_rails (3.5.16) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -156,7 +155,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -173,7 +172,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.3) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -183,9 +182,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.0.8) - excon (0.49.0) - execjs (2.6.0) + eventmachine (1.2.0.1) + excon (0.51.0) + execjs (2.7.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -200,7 +199,7 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.10) + ffi (1.9.14) flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) @@ -210,8 +209,8 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.9.4) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -220,7 +219,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -233,8 +232,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.6) - fog-core (>= 1.39) + fog-openstack (0.1.7) + fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -245,7 +244,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.1.0) + font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) foreman (0.78.0) thor (~> 0.19.1) @@ -257,7 +256,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.0) + get_process_mem (0.2.1) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -287,7 +286,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.0) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -321,10 +320,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.3) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.2) + hashie (3.4.4) + health_check (2.1.0) + rails (>= 4.0) + hipchat (1.5.3) httparty mimemagic html-pipeline (1.11.0) @@ -335,10 +334,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.7.0.1) + httpclient (2.8.0) i18n (0.7.0) - ice_nine (0.11.1) - influxdb (0.2.3) + ice_nine (0.11.2) + influxdb (0.3.5) cause json ipaddress (0.8.3) @@ -358,7 +357,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.11.1) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -369,7 +368,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (2.1.2) bundler httparty rubyzip @@ -377,9 +376,10 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -389,23 +389,23 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.3.21) nested_form (0.3.2) - net-ldap (0.12.1) - net-ssh (3.0.1) - newrelic_rpm (3.14.1.311) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -417,7 +417,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) + omniauth-auth0 (1.4.2) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -436,15 +436,14 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) + omniauth-google-oauth2 (0.4.1) + jwt (~> 1.5.2) multi_json (~> 1.3) omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) + omniauth-oauth2 (>= 1.3.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -453,7 +452,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-saml (1.6.0) @@ -471,9 +470,9 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) + paranoia (2.1.5) activerecord (~> 4.0) - parser (2.3.1.0) + parser (2.3.1.2) ast (~> 2.2) pg (0.18.4) pkg-config (1.1.7) @@ -484,13 +483,13 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.8.7) + css_parser (>= 1.4.5) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) + premailer-rails (1.9.4) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -505,7 +504,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.1) + rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -540,19 +539,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.16.0) rake (10.5.0) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.0.0) + recaptcha (3.3.0) json - redcarpet (3.3.3) - redis (3.2.2) + redcarpet (3.3.4) + redis (3.3.0) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -571,23 +570,23 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.0) + request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.0) - rqrcode (0.7.0) - chunky_png + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) + rspec-core (3.5.1) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -595,7 +594,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.0) + rspec-rails (3.5.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -617,14 +616,15 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-progressbar (1.8.1) - ruby-saml (1.3.0) + ruby-saml (1.3.1) nokogiri (>= 1.5.10) + ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.5.2) + rubyntlm (0.6.0) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.1.10) + rufus-scheduler (3.2.1) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -648,7 +648,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -663,7 +663,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -697,7 +697,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -758,7 +758,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) unicorn (4.9.0) kgio (~> 2.6) rack @@ -786,7 +786,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -806,7 +806,7 @@ DEPENDENCIES activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) - after_commit_queue + after_commit_queue (~> 1.3.0) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.4.0) @@ -815,15 +815,15 @@ DEPENDENCIES awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) - benchmark-ips + benchmark-ips (~> 2.3.0) better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) brakeman (~> 3.3.0) browser (~> 2.2) - bullet - bundler-audit - byebug + bullet (~> 5.0.0) + bundler-audit (~> 0.5.0) + byebug (~> 8.2.1) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) @@ -844,8 +844,8 @@ DEPENDENCIES email_spec (~> 1.6.0) factory_girl_rails (~> 4.6.0) ffaker (~> 2.0.0) - flay - flog + flay (~> 2.6.1) + flog (~> 4.3.2) fog-aws (~> 0.9) fog-azure (~> 0.0) fog-core (~> 1.40) @@ -854,7 +854,7 @@ DEPENDENCIES fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.6.1) - foreman + foreman (~> 0.78.0) fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 2.6) @@ -870,7 +870,7 @@ DEPENDENCIES grape (~> 0.13.0) grape-entity (~> 0.4.2) hamlit (~> 2.5) - health_check (~> 1.5.1) + health_check (~> 2.1.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) @@ -881,9 +881,9 @@ DEPENDENCIES jquery-ui-rails (~> 5.0.0) jwt kaminari (~> 0.17.0) - knapsack + knapsack (~> 1.11.0) letter_opener_web (~> 1.3.0) - license_finder + license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) mail_room (~> 0.8) @@ -905,7 +905,7 @@ DEPENDENCIES omniauth-facebook (~> 3.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) + omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) omniauth-saml (~> 1.6.0) omniauth-shibboleth (~> 1.2.0) @@ -916,19 +916,19 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) - pry-rails + pry-rails (~> 0.3.4) rack-attack (~> 4.3.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) rails (= 4.2.6) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) - rblineprof + rblineprof (~> 0.3.6) rdoc (~> 3.6) recaptcha (~> 3.0) redcarpet (~> 3.3.3) redis (~> 3.2) - redis-namespace + redis-namespace (~> 1.5.2) redis-rails (~> 4.0.0) request_store (~> 1.3.0) rerun (~> 0.11.0) @@ -936,7 +936,7 @@ DEPENDENCIES rouge (~> 1.11) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) - rspec-retry + rspec-retry (~> 0.4.5) rubocop (~> 0.40.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) @@ -948,7 +948,7 @@ DEPENDENCIES select2-rails (~> 3.5.9) sentry-raven (~> 1.1.0) settingslogic (~> 2.0.9) - sham_rack + sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) sidekiq (~> 4.0) sidekiq-cron (~> 0.4.0) -- GitLab From 2bbe6741f5422150f989f8e6fcb19a9517772f7d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 16:13:38 +0100 Subject: [PATCH 175/183] fix gemfile.lock --- Gemfile.lock | 154 +++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10bee450bffe..f8018e58a5e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,13 +57,14 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) + asciidoctor (1.5.3) + ast (2.2.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) + attr_required (1.0.0) + autoprefixer-rails (6.2.3) execjs + json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -105,7 +106,7 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.5) + byebug (8.2.1) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -113,7 +114,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.13) + capybara-screenshot (1.0.11) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -125,9 +126,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.6) + chunky_png (1.3.5) cliver (0.3.2) - coderay (1.1.1) + coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -137,15 +138,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.8.1) + colorize (0.7.7) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.5) + css_parser (1.4.1) addressable - d3_rails (3.5.16) + d3_rails (3.5.11) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -155,7 +156,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) + devise (4.1.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -172,7 +173,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.3) + dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -182,9 +183,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.51.0) - execjs (2.7.0) + eventmachine (1.0.8) + excon (0.49.0) + execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -199,7 +200,7 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.14) + ffi (1.9.10) flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) @@ -209,8 +210,8 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) + fog-aws (0.9.2) + fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -219,7 +220,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.42.0) + fog-core (1.40.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -232,8 +233,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) + fog-openstack (0.1.6) + fog-core (>= 1.39) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -244,7 +245,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.6.1.0) railties (>= 3.2, < 5.1) foreman (0.78.0) thor (~> 0.19.1) @@ -256,7 +257,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.1) + get_process_mem (0.2.0) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -273,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.3.0) + gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -286,7 +287,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) + gollum-grit_adapter (1.0.0) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -320,10 +321,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.4) + hashie (3.4.3) health_check (2.1.0) rails (>= 4.0) - hipchat (1.5.3) + hipchat (1.5.2) httparty mimemagic html-pipeline (1.11.0) @@ -334,10 +335,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.0) + httpclient (2.7.0.1) i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) + ice_nine (0.11.1) + influxdb (0.2.3) cause json ipaddress (0.8.3) @@ -357,7 +358,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.1) + knapsack (1.11.0) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -368,7 +369,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.2) + license_finder (2.1.0) bundler httparty rubyzip @@ -376,10 +377,9 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -389,23 +389,23 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.1) + mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.21) + mysql2 (0.3.20) nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) + net-ldap (0.12.1) + net-ssh (3.0.1) + newrelic_rpm (3.14.1.311) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.5.1) + oauth (0.4.7) oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -417,7 +417,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) + omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -436,14 +436,15 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) + omniauth-gitlab (1.0.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.4.1) - jwt (~> 1.5.2) + addressable (~> 2.3) + jwt (~> 1.0) multi_json (~> 1.3) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (~> 1.3.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -452,7 +453,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) + omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-saml (1.6.0) @@ -470,9 +471,9 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.5) + paranoia (2.1.4) activerecord (~> 4.0) - parser (2.3.1.2) + parser (2.3.1.0) ast (~> 2.2) pg (0.18.4) pkg-config (1.1.7) @@ -483,13 +484,13 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) + premailer (1.8.6) + css_parser (>= 1.3.6) htmlentities (>= 4.0.0) - premailer-rails (1.9.4) + premailer-rails (1.9.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - pry (0.10.4) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -504,7 +505,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.3) + rack-oauth2 (1.2.1) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -539,19 +540,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.16.0) + raindrops (0.15.0) rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.3.0) + recaptcha (3.0.0) json - redcarpet (3.3.4) - redis (3.3.0) + redcarpet (3.3.3) + redis (3.2.2) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -570,23 +571,23 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.1) + request_store (1.3.0) rerun (0.11.0) listen (~> 3.0) - responders (2.2.0) + responders (2.1.1) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) + rouge (1.11.0) + rqrcode (0.7.0) + chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) + rspec-core (3.5.0) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -594,7 +595,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-rails (3.5.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -616,15 +617,14 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-progressbar (1.8.1) - ruby-saml (1.3.1) + ruby-saml (1.3.0) nokogiri (>= 1.5.10) - ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.6.0) + rubyntlm (0.5.2) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.2.1) + rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -648,7 +648,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.10) + select2-rails (3.5.9.3) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -663,7 +663,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) + sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -697,7 +697,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.6.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -758,7 +758,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.0.5) unicorn (4.9.0) kgio (~> 2.6) rack @@ -786,7 +786,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.4) + websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) -- GitLab From 421ec6e089e161bc7a7db61336a17a3e776916f7 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 16:17:24 +0100 Subject: [PATCH 176/183] changes " usage to ' --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index cbcd9f20ace2..5c43015e52c6 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 10.2' +gem 'gitlab_git', '~> 10.2' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes -- GitLab From 4352ff0d446337b8718e9164d7fdac08fcc53d6f Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 12 Jul 2016 17:29:24 +0100 Subject: [PATCH 177/183] fixes frontend bug --- app/views/projects/blob/_editor.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index ba3b3439e9ba..ad3009f30ab7 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -5,7 +5,7 @@ = ref %span.editor-file-name - if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] || @file_path), + = text_field_tag 'file_name', (params[:file_name] || @path), class: 'form-control new-file-name' - if current_action?(:new) || current_action?(:create) -- GitLab From dd3addad481e7e0475cfecd16c8bcd3dc65e967d Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Wed, 13 Jul 2016 11:19:14 +0100 Subject: [PATCH 178/183] renames :file_name to :file_path --- app/controllers/projects/blob_controller.rb | 4 ++-- app/views/projects/blob/_editor.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 0120ad8e0582..eda3727a28de 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -38,9 +38,9 @@ def edit end def update - unless params[:file_name].nil? || params[:file_name].empty? + if params[:file_path].present? @previous_path = @path - @path = params[:file_name] + @path = params[:file_path] @commit_params[:file_path] = @path end diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index ad3009f30ab7..ff379bafb267 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -5,8 +5,8 @@ = ref %span.editor-file-name - if current_action?(:edit) || current_action?(:update) - = text_field_tag 'file_name', (params[:file_name] || @path), - class: 'form-control new-file-name' + = text_field_tag 'file_path', (params[:file_path] || @path), + class: 'form-control new-file-path' - if current_action?(:new) || current_action?(:create) %span.editor-file-name -- GitLab From 2e021c4e17f0ffb223d388ef4c177f82f162e805 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 18 Jul 2016 13:29:14 +0100 Subject: [PATCH 179/183] bumps gitlab_git to 10.3.0 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8018e58a5e7..df8e2008bcaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.2.3) + gitlab_git (10.3.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -389,6 +389,7 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) + mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) -- GitLab From c6097f24d32610d4c12ae0e9d16b72dc53cda9da Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 18 Jul 2016 14:53:27 +0100 Subject: [PATCH 180/183] adds test for update_file method --- spec/models/repository_spec.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 24e49c8def34..75afb0c10228 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -129,6 +129,20 @@ end end + describe :update_file do + it 'updates filename successfully' do + expect{repository.update_file(user, 'NEWLICENSE', 'Copyright!', + branch: 'master', + previous_path: 'LICENSE', + message: 'Changes filename')}.to change { repository.commits('master').count }.by(1) + + files = repository.ls_files('master') + + expect(files).not_to include('LICENSE') + expect(files).to include('NEWLICENSE') + end + end + describe "search_files" do let(:results) { repository.search_files('feature', 'master') } subject { results } -- GitLab From 28f85155f5125131d109629871a3257a471ad5af Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Mon, 18 Jul 2016 23:13:21 +0100 Subject: [PATCH 181/183] fixes rubocop issues and implements create_commit test --- Gemfile.lock | 1 - spec/models/repository_spec.rb | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4f6a8f67a4dc..7851f93485d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,6 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index c1ebbf9ac4eb..eb71a62ec567 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -129,12 +129,28 @@ end end + describe :create_file do + it 'commits change to a file successfully' do + expect do + repository.commit_file(user, 'LICENSE', 'Copyright!', + 'Updates filename', + 'master', true) + end.to change { repository.commits('master').count }.by(1) + + blob = Blob.decorate(repository.blob_at(repository.commits('master').first.id, 'LICENSE')) + + expect(blob.data).to eq('Copyright!') + end + end + describe :update_file do it 'updates filename successfully' do - expect{repository.update_file(user, 'NEWLICENSE', 'Copyright!', + expect do + repository.update_file(user, 'NEWLICENSE', 'Copyright!', branch: 'master', previous_path: 'LICENSE', - message: 'Changes filename')}.to change { repository.commits('master').count }.by(1) + message: 'Changes filename') + end.to change { repository.commits('master').count }.by(1) files = repository.ls_files('master') -- GitLab From 5c69043e7534fdb04d62b7e1f7efe72de9b33b5e Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 19 Jul 2016 12:03:27 +0100 Subject: [PATCH 182/183] fixes commit_file test on repository_spec --- spec/models/repository_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index d55fd36548ad..110df6bbd22c 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -130,17 +130,17 @@ end end - describe :create_file do + describe :commit_file do it 'commits change to a file successfully' do expect do - repository.commit_file(user, 'LICENSE', 'Copyright!', - 'Updates filename', + repository.commit_file(user, 'CHANGELOG', 'Changelog!', + 'Updates file content', 'master', true) end.to change { repository.commits('master').count }.by(1) - blob = Blob.decorate(repository.blob_at(repository.commits('master').first.id, 'LICENSE')) + blob = repository.blob_at('master', 'CHANGELOG') - expect(blob.data).to eq('Copyright!') + expect(blob.data).to eq('Changelog!') end end -- GitLab From ff059360587f61907fb0a2691984ddd05fe049b9 Mon Sep 17 00:00:00 2001 From: tiagonbotelho Date: Tue, 19 Jul 2016 15:27:29 +0100 Subject: [PATCH 183/183] fixes an issue cause by a bad merge --- app/models/repository.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 48a68b449759..1a2ac90da513 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,7 +741,8 @@ def update_file(user, path, content, branch:, previous_path:, message:) options[:author] = committer options[:commit] = { message: message, - branch: ref + branch: ref, + update_ref: false } options[:file] = { -- GitLab