From f33fe50f0d37757bd482106fe4e82c09ecfe42d0 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 17 Jul 2015 22:54:04 -0700 Subject: Disable internal issue tracker if external tracker in use Closes #2006 --- CHANGELOG | 1 + app/controllers/projects/issues_controller.rb | 2 +- .../controllers/projects/issues_controller_spec.rb | 37 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 spec/controllers/projects/issues_controller_spec.rb diff --git a/CHANGELOG b/CHANGELOG index 001d5350bad..91b1122ee7b 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 7.14.0 (unreleased) + - Disable internal issue tracker controller if external tracker is used (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index bfafdeeb1fb..0f89f2e88cc 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -131,7 +131,7 @@ class Projects::IssuesController < Projects::ApplicationController end def module_enabled - return render_404 unless @project.issues_enabled + return render_404 unless @project.issues_enabled && @project.default_issues_tracker? end # Since iids are implemented only in 6.1 diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb new file mode 100644 index 00000000000..871b9219ca9 --- /dev/null +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -0,0 +1,37 @@ +require('spec_helper') + +describe Projects::IssuesController do + let(:project) { create(:project) } + let(:user) { create(:user) } + let(:issue) { create(:issue, project: project) } + + before do + sign_in(user) + project.team << [user, :developer] + controller.instance_variable_set(:@project, project) + end + + describe "GET #index" do + it "returns index" do + get :index, namespace_id: project.namespace.id, project_id: project.id + + expect(response.status).to eq(200) + end + + it "returns 404 when issues are disabled" do + project.issues_enabled = false + project.save + + get :index, namespace_id: project.namespace.id, project_id: project.id + expect(response.status).to eq(404) + end + + it "returns 404 when external issue tracker is enabled" do + allow(project).to receive(:default_issues_tracker?).and_return(false) + + get :index, namespace_id: project.namespace.id, project_id: project.id + expect(response.status).to eq(404) + end + + end +end -- cgit v1.2.1 From 8e53bae700e356a42f86457295b6b25fc0b03d6d Mon Sep 17 00:00:00 2001 From: karen Carias Date: Sun, 2 Aug 2015 09:52:30 -0700 Subject: New doc about how to add an image in GitLab Basics --- doc/gitlab-basics/README.md | 2 ++ doc/gitlab-basics/add-image.md | 62 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 doc/gitlab-basics/add-image.md diff --git a/doc/gitlab-basics/README.md b/doc/gitlab-basics/README.md index 9491f8c91fe..b904c70e980 100644 --- a/doc/gitlab-basics/README.md +++ b/doc/gitlab-basics/README.md @@ -20,4 +20,6 @@ Step-by-step guides on the basics of working with Git and GitLab. * [Add a file](add-file.md) +* [Add an image](add-image.md) + * [Create a Merge Request](add-merge-request.md) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md new file mode 100644 index 00000000000..4a43e8c3584 --- /dev/null +++ b/doc/gitlab-basics/add-image.md @@ -0,0 +1,62 @@ +# How to add an image + +The following are the steps to add images to your repository in +GitLab: + +Find the image that you’d like to add. + +In your computer files, find the GitLab project to which you'd like to add the image +(you'll find it as a regular file). Click on every file until you find exactly where you'd +like to add the image. There, paste the image. + +Go to your [shell](command-line-commands.md), and add the following commands: + +- To find the correct file, add this command for every file that you'd like to open until +you reach the file where you added your image: +``` +cd NAME-OF-FILE-YOU'D-LIKE-TO-OPEN +``` + +- Create a new branch: +``` +git checkout -b NAME-OF-BRANCH +``` + +- Check if your image was correctly added to the file: +``` +ls +``` + +You should see the name of the image in the list shown. + +- Go back one file: +``` +cd ../ +``` + +- Check the status and you should see your image’s name in red: +``` +git status +``` + +- Add your changes: +``` +git add NAME-OF-YOUR-IMAGE +``` + +- Check the status and you should see your image’s name in green: +``` +git status +``` + +- Add the commit: +``` +git commit -m “DESCRIBE COMMIT IN A FEW WORDS” +``` + +- Send your changes to GitLab.com: +``` +git push origin NAME-OF-BRANCH +``` + +Your image should've been added to your repository in GitLab. -- cgit v1.2.1 From 4f9d32eab01a51b9de6ff49b74e4599bdcccbc99 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Sun, 2 Aug 2015 09:54:42 -0700 Subject: typo --- doc/gitlab-basics/add-image.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index 4a43e8c3584..f3ef569f724 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -11,50 +11,50 @@ like to add the image. There, paste the image. Go to your [shell](command-line-commands.md), and add the following commands: -- To find the correct file, add this command for every file that you'd like to open until +To find the correct file, add this command for every file that you'd like to open until you reach the file where you added your image: ``` cd NAME-OF-FILE-YOU'D-LIKE-TO-OPEN ``` -- Create a new branch: +Create a new branch: ``` git checkout -b NAME-OF-BRANCH ``` -- Check if your image was correctly added to the file: +Check if your image was correctly added to the file: ``` ls ``` You should see the name of the image in the list shown. -- Go back one file: +Go back one file: ``` cd ../ ``` -- Check the status and you should see your image’s name in red: +Check the status and you should see your image’s name in red: ``` git status ``` -- Add your changes: +Add your changes: ``` git add NAME-OF-YOUR-IMAGE ``` -- Check the status and you should see your image’s name in green: +Check the status and you should see your image’s name in green: ``` git status ``` -- Add the commit: +Add the commit: ``` git commit -m “DESCRIBE COMMIT IN A FEW WORDS” ``` -- Send your changes to GitLab.com: +Send your changes to GitLab.com: ``` git push origin NAME-OF-BRANCH ``` -- cgit v1.2.1 From 88ae5a9b207122d3a90cc13bab9c41af3b87f14d Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 3 Aug 2015 15:36:26 -0700 Subject: fixed terminology --- doc/gitlab-basics/add-image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index f3ef569f724..461cd9f6170 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -54,7 +54,7 @@ Add the commit: git commit -m “DESCRIBE COMMIT IN A FEW WORDS” ``` -Send your changes to GitLab.com: +Now you can push (send) your changes (in the branch NAME-OF-BRANCH) to GitLab (the git remote named 'origin'): ``` git push origin NAME-OF-BRANCH ``` -- cgit v1.2.1 From bac34a38f624527549a2a411d547f26f3fcc2cc5 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 6 Aug 2015 22:40:38 -0700 Subject: fixed one line --- doc/gitlab-basics/add-image.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index 461cd9f6170..28b6f3a925c 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -59,4 +59,5 @@ Now you can push (send) your changes (in the branch NAME-OF-BRANCH) to GitLab (t git push origin NAME-OF-BRANCH ``` -Your image should've been added to your repository in GitLab. +Your image will be added to your branch in your repository in GitLab. Create a [Merge Request](add-merge-request.md) +to integrate your changes to your project. -- cgit v1.2.1 From 95aa13f0b7efc096012db6634c169a4c83b059f6 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 10 Aug 2015 17:17:30 -0700 Subject: fixed text --- doc/gitlab-basics/add-image.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index 28b6f3a925c..e574c0ec7e9 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -11,8 +11,7 @@ like to add the image. There, paste the image. Go to your [shell](command-line-commands.md), and add the following commands: -To find the correct file, add this command for every file that you'd like to open until -you reach the file where you added your image: +Add this command for every directory that you'd like to open: ``` cd NAME-OF-FILE-YOU'D-LIKE-TO-OPEN ``` -- cgit v1.2.1 From ff1054340378f3a30fecf12bb43c0fada9be4f04 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 19:55:01 +0200 Subject: Move merge manually text below merge widget Signed-off-by: Dmitriy Zaporozhets --- app/views/projects/merge_requests/_show.html.haml | 18 +++++++++--------- .../merge_requests/widget/open/_accept.html.haml | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index cd53856c4a6..007f6c6a787 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -22,19 +22,19 @@ %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch) %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) .light - %div - %span Request to merge - %span.label-branch #{source_branch_with_namespace(@merge_request)} - %span into - %span.label-branch #{@merge_request.target_branch} - - if @merge_request.open? && !@merge_request.branch_missing? - %div - If you want to try or merge this request manually, you can use the - = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" + %span Request to merge + %span.label-branch #{source_branch_with_namespace(@merge_request)} + %span into + %span.label-branch #{@merge_request.target_branch} = render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/widget/show.html.haml" + - if @merge_request.open? && @merge_request.can_be_merged? + .light + You can also accept this merge request manually using the + = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" + - if @commits.present? %ul.nav.nav-tabs.merge-request-tabs %li.notes-tab diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index d8f6ce91c0c..df20205de1c 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -23,4 +23,3 @@ btn = $('.accept_merge_request') btn.disable() btn.html(" Merge in progress") - -- cgit v1.2.1 From 3c036ea1576349d2e26f82a119f8c79e12daecb2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 19:56:11 +0200 Subject: Fix changelog Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e14255ee9b2..d5732bb431d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,12 +29,9 @@ v 7.14.0 (unreleased) - Return comments in created order in merge request API (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) - - Add fetch command to the MR page. - Allow custom backup archive permissions - - Add fetch command to the MR page - Add project star and fork count, group avatar URL and user/group web URL attributes to API - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - - Add fetch command to the MR page. - Show who last edited a comment if it wasn't the original author - Send notification to all participants when MR is merged. - Add ability to manage user email addresses via the API. -- cgit v1.2.1 From 8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 Mon Sep 17 00:00:00 2001 From: "Florent (HP)" Date: Sun, 9 Aug 2015 20:31:50 +0200 Subject: Add merged label on branches page --- CHANGELOG | 1 + app/models/repository.rb | 11 +++++++++++ app/views/projects/branches/_branch.html.haml | 5 +++++ spec/models/repository_spec.rb | 20 ++++++++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e14255ee9b2..16ed0470f8e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Fix bug causing error when the target branch of a symbolic ref was deleted - Include branch/tag name in archive file and directory name - Add dropzone upload progress + - Add a label for merged branches on branches page (Florent Baldino) v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. diff --git a/app/models/repository.rb b/app/models/repository.rb index 0a62980f93a..3bba3ca888a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -364,6 +364,17 @@ class Repository @root_ref ||= raw_repository.root_ref end + def merged_to_root_ref?(branch_name) + branch_commit = commit(branch_name) + root_ref_commit = commit(root_ref) + + if branch_commit + rugged.merge_base(root_ref_commit.id, branch_commit.id) == branch_commit.id + else + nil + end + end + def search_files(query, ref) offset = 2 args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} #{query} #{ref || root_ref}) diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 43412624da6..a693c4b282f 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -5,6 +5,11 @@ %strong.str-truncated= branch.name - if branch.name == @repository.root_ref %span.label.label-info default + - elsif @repository.merged_to_root_ref? branch.name + %span.label.label-primary.has_tooltip(title="Merged into #{@repository.root_ref}") + %i.fa.fa-check + merged + - if @project.protected_branch? branch.name %span.label.label-success %i.fa.fa-lock diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 0927cde61a6..8e2849691ff 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -34,6 +34,26 @@ describe Repository do end end + describe :merged_to_root_ref? do + context 'merged branch' do + subject { repository.merged_to_root_ref?('improve/awesome') } + + it { is_expected.to be_truthy } + end + + context 'non merged branch' do + subject { repository.merged_to_root_ref?('fix') } + + it { is_expected.to be_falsey } + end + + context 'non existent branch' do + subject { repository.merged_to_root_ref?('non_existent_branch') } + + it { is_expected.to be_nil } + end + end + describe "search_files" do let(:results) { repository.search_files('feature', 'master') } subject { results } -- cgit v1.2.1 From 1df163866ffbb5c1e748741dd88e3e7d0330a36b Mon Sep 17 00:00:00 2001 From: karen Carias Date: Tue, 11 Aug 2015 19:16:13 -0700 Subject: fixed text --- doc/gitlab-basics/add-image.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index e574c0ec7e9..fab60c552a5 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -21,14 +21,14 @@ Create a new branch: git checkout -b NAME-OF-BRANCH ``` -Check if your image was correctly added to the file: +Check if your image was correctly added to the directory: ``` ls ``` You should see the name of the image in the list shown. -Go back one file: +Go back one directory: ``` cd ../ ``` -- cgit v1.2.1 From 235acd2226aa938fd4d992ca5daf44565b8316a4 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Tue, 11 Aug 2015 19:18:20 -0700 Subject: fixed text --- doc/gitlab-basics/add-image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index fab60c552a5..476b48a217c 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -28,7 +28,7 @@ ls You should see the name of the image in the list shown. -Go back one directory: +Move up the hierarchy through directories: ``` cd ../ ``` -- cgit v1.2.1 From 23790570026ce78e3b4cbbf1b2f32ada992c5f40 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 12 Aug 2015 00:40:54 -0700 Subject: Provide more feedback what went wrong if HipChat service failed test Issue gitlab-com/support-forum#213 --- CHANGELOG | 1 + app/controllers/projects/services_controller.rb | 7 +++-- app/models/project_services/hipchat_service.rb | 10 +++++++ app/models/service.rb | 8 ++++- .../projects/services_controller_spec.rb | 35 ++++++++++++++++++++++ .../project_services/hipchat_service_spec.rb | 8 +++++ spec/models/service_spec.rb | 10 +++++++ 7 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 spec/controllers/projects/services_controller_spec.rb diff --git a/CHANGELOG b/CHANGELOG index e14255ee9b2..0718a9afa00 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 7.14.0 (unreleased) + - Provide more feedback what went wrong if HipChat service failed test (Stan Hu) - Disable turbolinks when linking to Bitbucket import status (Stan Hu) - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu) - Fix corrupted binary files when using API files endpoint (Stan Hu) diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 1e435be8275..01105532479 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -39,10 +39,13 @@ class Projects::ServicesController < Projects::ApplicationController def test data = Gitlab::PushDataBuilder.build_sample(project, current_user) - if @service.execute(data) + outcome = @service.test(data) + if outcome[:success] message = { notice: 'We sent a request to the provided URL' } else - message = { alert: 'We tried to send a request to the provided URL but an error occured' } + error_message = "We tried to send a request to the provided URL but an error occurred" + error_message << ": #{outcome[:result]}" if outcome[:result].present? + message = { alert: error_message } end redirect_to :back, message diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 6761f00183e..7a15a861abc 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -60,6 +60,16 @@ class HipchatService < Service gate[room].send('GitLab', message, message_options) end + def test(data) + begin + result = execute(data) + rescue StandardError => error + return { success: false, result: error } + end + + { success: true, result: result } + end + private def gate diff --git a/app/models/service.rb b/app/models/service.rb index 818a6808db5..dcef2866c3b 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -87,10 +87,16 @@ class Service < ActiveRecord::Base %w(push tag_push issue merge_request) end - def execute + def execute(data) # implement inside child end + def test(data) + # default implementation + result = execute(data) + { success: result.present?, result: result } + end + def can_test? !project.empty_repo? end diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb new file mode 100644 index 00000000000..d4ecd98e12d --- /dev/null +++ b/spec/controllers/projects/services_controller_spec.rb @@ -0,0 +1,35 @@ +require 'spec_helper' + +describe Projects::ServicesController do + let(:project) { create(:project) } + let(:user) { create(:user) } + let(:service) { create(:service, project: project) } + + before do + sign_in(user) + project.team << [user, :master] + controller.instance_variable_set(:@project, project) + controller.instance_variable_set(:@service, service) + request.env["HTTP_REFERER"] = "/" + end + + describe "#test" do + context 'success' do + it "should redirect and show success message" do + expect(service).to receive(:test).and_return({ success: true, result: 'done' }) + get :test, namespace_id: project.namespace.id, project_id: project.id, id: service.id, format: :html + expect(response.status).to redirect_to('/') + expect(flash[:notice]).to eq('We sent a request to the provided URL') + end + end + + context 'failure' do + it "should redirect and show failure message" do + expect(service).to receive(:test).and_return({ success: false, result: 'Bad test' }) + get :test, namespace_id: project.namespace.id, project_id: project.id, id: service.id, format: :html + expect(response.status).to redirect_to('/') + expect(flash[:alert]).to eq('We tried to send a request to the provided URL but an error occurred: Bad test') + end + end + end +end diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb index 4707673269a..65d16beef91 100644 --- a/spec/models/project_services/hipchat_service_spec.rb +++ b/spec/models/project_services/hipchat_service_spec.rb @@ -47,6 +47,14 @@ describe HipchatService do WebMock.stub_request(:post, api_url) end + it 'should test and return errors' do + allow(hipchat).to receive(:execute).and_raise(StandardError, 'no such room') + result = hipchat.test(push_sample_data) + + expect(result[:success]).to be_falsey + expect(result[:result].to_s).to eq('no such room') + end + it 'should use v1 if version is provided' do allow(hipchat).to receive(:api_version).and_return('v1') expect(HipChat::Client).to receive(:new). diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index ca11758ee06..a213ffe6c4b 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -46,6 +46,16 @@ describe Service do describe :can_test do it { expect(@testable).to eq(true) } end + + describe :test do + let(:data) { 'test' } + + it 'test runs execute' do + expect(@service).to receive(:execute).with(data) + + @service.test(data) + end + end end describe "With commits" do -- cgit v1.2.1 From 7430e7b5fc5d9c24a3d86166153e555e0a3812f1 Mon Sep 17 00:00:00 2001 From: Ted Strzalkowski Date: Tue, 11 Aug 2015 08:58:22 -0700 Subject: Workaround the warnings emitted by MySQL 5.6 regarding password on the command line. --- lib/backup/database.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/backup/database.rb b/lib/backup/database.rb index bbb230a10f0..939f28fc1c6 100644 --- a/lib/backup/database.rb +++ b/lib/backup/database.rb @@ -18,6 +18,8 @@ module Backup success = case config["adapter"] when /^mysql/ then $progress.print "Dumping MySQL database #{config['database']} ... " + # Workaround warnings from MySQL 5.6 about passwords on cmd line + ENV['MYSQL_PWD'] = config["password"].to_s if config["password"] system('mysqldump', *mysql_args, config['database'], out: db_file_name) when "postgresql" then $progress.print "Dumping PostgreSQL database #{config['database']} ... " @@ -43,6 +45,8 @@ module Backup success = case config["adapter"] when /^mysql/ then $progress.print "Restoring MySQL database #{config['database']} ... " + # Workaround warnings from MySQL 5.6 about passwords on cmd line + ENV['MYSQL_PWD'] = config["password"].to_s if config["password"] system('mysql', *mysql_args, config['database'], in: db_file_name) when "postgresql" then $progress.print "Restoring PostgreSQL database #{config['database']} ... " @@ -69,8 +73,7 @@ module Backup 'port' => '--port', 'socket' => '--socket', 'username' => '--user', - 'encoding' => '--default-character-set', - 'password' => '--password' + 'encoding' => '--default-character-set' } args.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact end -- cgit v1.2.1 From fb6e8008c4010aa5445b129e5b18e379a0ef487e Mon Sep 17 00:00:00 2001 From: Alex Lossent Date: Wed, 12 Aug 2015 17:20:01 +0200 Subject: Fix redirection after sign in when using auto_sign_in_with_provider Logic for redirect path moved to a filter. --- CHANGELOG | 1 + app/controllers/sessions_controller.rb | 39 ++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 16ed0470f8e..49c6bae437c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,7 @@ v 7.14.0 (unreleased) - Include branch/tag name in archive file and directory name - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) + - Fix redirection after sign in when using auto_sign_in_with_provider v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 796cbe4c58c..8389f07a3bd 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -2,27 +2,10 @@ class SessionsController < Devise::SessionsController include AuthenticatesWithTwoFactor prepend_before_action :authenticate_with_two_factor, only: [:create] + prepend_before_action :store_redirect_path, only: [:new] before_action :auto_sign_in_with_provider, only: [:new] def new - redirect_path = - if request.referer.present? && (params['redirect_to_referer'] == 'yes') - referer_uri = URI(request.referer) - if referer_uri.host == Gitlab.config.gitlab.host - referer_uri.path - else - request.fullpath - end - else - request.fullpath - end - - # Prevent a 'you are already signed in' message directly after signing: - # we should never redirect to '/users/sign_in' after signing in successfully. - unless redirect_path == new_user_session_path - store_location_for(:redirect, redirect_path) - end - if Gitlab.config.ldap.enabled @ldap_servers = Gitlab::LDAP::Config.servers end @@ -55,6 +38,26 @@ class SessionsController < Devise::SessionsController User.find(session[:otp_user_id]) end end + + def store_redirect_path + redirect_path = + if request.referer.present? && (params['redirect_to_referer'] == 'yes') + referer_uri = URI(request.referer) + if referer_uri.host == Gitlab.config.gitlab.host + referer_uri.path + else + request.fullpath + end + else + request.fullpath + end + + # Prevent a 'you are already signed in' message directly after signing: + # we should never redirect to '/users/sign_in' after signing in successfully. + unless redirect_path == new_user_session_path + store_location_for(:redirect, redirect_path) + end + end def authenticate_with_two_factor user = self.resource = find_user -- cgit v1.2.1 From 013260e057068ecc1e5330156d95bb7fbe996575 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 12 Aug 2015 15:29:00 -0400 Subject: markup_helper: detect .mkd and .mkdn as markdown --- CHANGELOG | 1 + lib/gitlab/markup_helper.rb | 2 +- spec/lib/gitlab/markup_helper_spec.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 16ed0470f8e..162789388a8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,7 @@ v 7.14.0 (unreleased) - Include branch/tag name in archive file and directory name - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) + - Detect .mkd and .mkdn files as markdown (Ben Boeckel) v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb index b1991e2e285..a5f767b134d 100644 --- a/lib/gitlab/markup_helper.rb +++ b/lib/gitlab/markup_helper.rb @@ -21,7 +21,7 @@ module Gitlab # # Returns boolean def gitlab_markdown?(filename) - filename.downcase.end_with?(*%w(.mdown .md .markdown)) + filename.downcase.end_with?(*%w(.mdown .mkd .mkdn .md .markdown)) end # Public: Determines if the given filename has AsciiDoc extension. diff --git a/spec/lib/gitlab/markup_helper_spec.rb b/spec/lib/gitlab/markup_helper_spec.rb index 7e716e866b1..e610fab05da 100644 --- a/spec/lib/gitlab/markup_helper_spec.rb +++ b/spec/lib/gitlab/markup_helper_spec.rb @@ -15,7 +15,7 @@ describe Gitlab::MarkupHelper do end describe '#gitlab_markdown?' do - %w(mdown md markdown).each do |type| + %w(mdown mkd mkdn md markdown).each do |type| it "returns true for #{type} files" do expect(Gitlab::MarkupHelper.gitlab_markdown?("README.#{type}")).to be_truthy end -- cgit v1.2.1 From 518aa7dca642b053980fac8e0a7b9439be144e5e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 12 Aug 2015 12:11:31 -0700 Subject: Bring clone bar back See discussion in !1080 --- app/assets/javascripts/project.js.coffee | 5 ----- app/views/projects/_home_panel.html.haml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee index 87c1b67a772..39a433dfc91 100644 --- a/app/assets/javascripts/project.js.coffee +++ b/app/assets/javascripts/project.js.coffee @@ -24,8 +24,3 @@ class @Project $.cookie('hide_no_password_message', 'false', { path: path }) $(@).parents('.no-password-message').remove() e.preventDefault() - - $('.js-toggle-clone-holder').on 'click', (e) -> - cloneHolder.toggle() - - cloneHolder.hide() unless $('.empty-project').length diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 71e92970305..bec40ec27a5 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -20,11 +20,6 @@ Forked from = forked_from_project.namespace.try(:name) - - if can? current_user, :download_code, @project - = link_to "#", class: 'btn js-toggle-clone-holder' do - = icon('cloud-download fw') - Clone - - if can? current_user, :download_code, @project = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: @ref, format: 'zip'), class: 'btn', rel: 'nofollow' do = icon('download fw') -- cgit v1.2.1 From 95f8f7c729a3a14ca6408ac050eb7bef6bb6fec4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 12 Aug 2015 15:39:58 -0400 Subject: api: add 'system', 'upvote', and 'downvote' fields to note queries This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9. --- app/models/note.rb | 4 ++++ doc/api/notes.md | 10 ++++++++-- lib/api/entities.rb | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/models/note.rb b/app/models/note.rb index a99d428b02d..913a8c00337 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -360,6 +360,10 @@ class Note < ActiveRecord::Base create_new_cross_references!(project, author) end + def system? + read_attribute(:system) + end + def editable? !read_attribute(:system) end diff --git a/doc/api/notes.md b/doc/api/notes.md index ee2f9fa0eac..c683cb883d4 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -31,7 +31,10 @@ Parameters: "state": "active", "created_at": "2013-09-30T13:46:01Z" }, - "created_at": "2013-10-02T09:22:45Z" + "created_at": "2013-10-02T09:22:45Z", + "system": true, + "upvote": false, + "downvote": false }, { "id": 305, @@ -45,7 +48,10 @@ Parameters: "state": "active", "created_at": "2013-09-30T13:46:01Z" }, - "created_at": "2013-10-02T09:56:03Z" + "created_at": "2013-10-02T09:56:03Z", + "system": false, + "upvote": false, + "downvote": false } ] ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index b5556682449..09d231af41b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -205,6 +205,9 @@ module API expose :attachment_identifier, as: :attachment expose :author, using: Entities::UserBasic expose :created_at + expose :system?, as: :system + expose :upvote?, as: :upvote + expose :downvote?, as: :downvote end class MRNote < Grape::Entity -- cgit v1.2.1 From b70988b4d6993e84a20ea9e4c68309618dfd7cf6 Mon Sep 17 00:00:00 2001 From: Andrea Ruggiero Date: Thu, 13 Aug 2015 11:25:10 +0200 Subject: Fix changelog --- CHANGELOG | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 428355a052c..159d081f554 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,7 +31,6 @@ v 7.14.0 (unreleased) - Add support for destroying project milestones (Stan Hu) - Allow custom backup archive permissions - Add project star and fork count, group avatar URL and user/group web URL attributes to API - - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Show who last edited a comment if it wasn't the original author - Send notification to all participants when MR is merged. - Add ability to manage user email addresses via the API. -- cgit v1.2.1 From fc7e63236e9cfb72fb2df6ea3da4874ca6f4b3b7 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 13 Aug 2015 12:49:26 +0300 Subject: update chnagelog --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 428355a052c..8a378670c41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,12 @@ v 7.14.0 (unreleased) - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) +v 7.13.5 + - Satellites reverted + +v 7.13.4 + - Allow users to send abuse reports + v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Allow users to send abuse reports -- cgit v1.2.1 From b3b0a1890e976a413fdc808d98b81714a12c3cd3 Mon Sep 17 00:00:00 2001 From: Andrea Ruggiero Date: Thu, 13 Aug 2015 13:25:54 +0200 Subject: Time for 7.14.0.pre --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5778e530e10..da8322eb293 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.13.0.pre +7.14.0.pre -- cgit v1.2.1 From 22eddffd415f092b2270aa83f620431899ea1a5f Mon Sep 17 00:00:00 2001 From: ranjith Date: Tue, 4 Aug 2015 16:05:15 +0530 Subject: Fixed #9527 --- app/assets/stylesheets/pages/issues.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 3572f33e91f..b628f99f22c 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -4,14 +4,25 @@ position: relative; .issue-title { - margin-bottom: 5px; font-size: $list-font-size; + margin-bottom: 5px; font-weight: bold; + float: left; + width: 97.7%; + } + + @media screen and (max-width: 1100px) { + .issues-list .issue .issue-title { + width: 97%; + } } .issue-info { color: #999; font-size: 13px; + display: inline-block; + width: 100%; + padding: 0 0 0 20px; } .issue-check { -- cgit v1.2.1 From e58e75aa8860c4c1530ebe7ad1e4bf557fa1e848 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 13 Aug 2015 16:06:17 +0300 Subject: Fix: User search feature in admin area does not respect filters --- CHANGELOG | 1 + app/views/admin/users/index.html.haml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bbbee1d929a..fafbd0e819c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) + - Fix: User search feature in admin area does not respect filters v 7.13.5 - Satellites reverted diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index b0d31170704..5e40d95d1c5 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -33,6 +33,7 @@ = form_tag admin_users_path, method: :get, class: 'form-inline' do .form-group = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' + = hidden_field_tag "filter", params[:filter] = button_tag class: 'btn btn-primary' do %i.fa.fa-search %hr -- cgit v1.2.1 From ec910c33072fecb60e9d47423da65bdbec7c3343 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Aug 2015 11:29:45 +0200 Subject: Set max-width for README, issue and merge request description It allows easier text reading on big screens Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/base/variables.scss | 1 + app/assets/stylesheets/pages/issuable.scss | 6 ++++++ app/assets/stylesheets/pages/tree.scss | 3 +++ 3 files changed, 10 insertions(+) diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss index 08f153dfbc9..cb439a0e0bf 100644 --- a/app/assets/stylesheets/base/variables.scss +++ b/app/assets/stylesheets/base/variables.scss @@ -13,6 +13,7 @@ $code_line_height: 1.5; $border-color: #E5E5E5; $background-color: #f5f5f5; $header-height: 50px; +$readable-width: 1100px; /* diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 586e7b5f8da..3f617e72b02 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -45,3 +45,9 @@ .btn { font-size: 13px; } } + +.issuable-details { + .description { + max-width: $readable-width; + } +} diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 092918e4de1..5f1a3db4fb6 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -116,6 +116,9 @@ } .readme-holder { + margin: 0 auto; + max-width: $readable-width; + .readme-file-title { font-size: 14px; font-weight: bold; -- cgit v1.2.1 From 8b9c12901677398e662118f50949c91ecdef20e3 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Aug 2015 11:35:48 +0200 Subject: Add CHANGELOG item Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index cd699995f20..f4abb5f5eb5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) - Fix: User search feature in admin area does not respect filters + - Set max-width for README, issue and merge request description for easier read on big screens v 7.13.5 - Satellites reverted -- cgit v1.2.1 From 88ab815b3844ce5c611d0ee5a1e8aaacb6c92faa Mon Sep 17 00:00:00 2001 From: Boyan Tabakov Date: Fri, 14 Aug 2015 15:31:11 +0200 Subject: Update Flowdock integration to support new Flowdock API Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used. --- CHANGELOG | 1 + Gemfile | 2 +- Gemfile.lock | 10 +++++++--- app/models/project_services/flowdock_service.rb | 2 +- spec/models/project_services/flowdock_service_spec.rb | 12 ++++++++---- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f4abb5f5eb5..b5cf393c6a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,7 @@ v 7.14.0 (unreleased) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) - Fix: User search feature in admin area does not respect filters - Set max-width for README, issue and merge request description for easier read on big screens + - Update Flowdock integration to support new Flowdock API (Boyan Tabakov) v 7.13.5 - Satellites reverted diff --git a/Gemfile b/Gemfile index 2483a7d24a3..6933930e253 100644 --- a/Gemfile +++ b/Gemfile @@ -150,7 +150,7 @@ gem 'tinder', '~> 1.9.2' gem 'hipchat', '~> 1.5.0' # Flowdock integration -gem "gitlab-flowdock-git-hook", "~> 0.4.2" +gem "gitlab-flowdock-git-hook", "~> 1.0.1" # Gemnasium integration gem "gemnasium-gitlab-service", "~> 0.2" diff --git a/Gemfile.lock b/Gemfile.lock index bff605df65e..043364a9689 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,6 +183,9 @@ GEM ffi (1.9.8) fission (0.5.0) CFPropertyList (~> 2.2) + flowdock (0.7.0) + httparty (~> 0.7) + multi_json fog (1.25.0) fog-brightbox (~> 0.4) fog-core (~> 1.25) @@ -255,7 +258,8 @@ GEM racc github-markup (1.3.1) posix-spawn (~> 0.3.8) - gitlab-flowdock-git-hook (0.4.2.2) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json gitlab-grack (2.0.2) @@ -779,7 +783,7 @@ DEPENDENCIES fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) github-markup - gitlab-flowdock-git-hook (~> 0.4.2) + gitlab-flowdock-git-hook (~> 1.0.1) gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) @@ -875,4 +879,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.10.5 + 1.10.6 diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb index bf801ba61ad..27fc19379f1 100644 --- a/app/models/project_services/flowdock_service.rb +++ b/app/models/project_services/flowdock_service.rb @@ -38,7 +38,7 @@ class FlowdockService < Service def fields [ - { type: 'text', name: 'token', placeholder: '' } + { type: 'text', name: 'token', placeholder: 'Flowdock Git source token' } ] end diff --git a/spec/models/project_services/flowdock_service_spec.rb b/spec/models/project_services/flowdock_service_spec.rb index 7e5b15cb09e..16296607a94 100644 --- a/spec/models/project_services/flowdock_service_spec.rb +++ b/spec/models/project_services/flowdock_service_spec.rb @@ -39,15 +39,19 @@ describe FlowdockService do token: 'verySecret' ) @sample_data = Gitlab::PushDataBuilder.build_sample(project, user) - @api_url = 'https://api.flowdock.com/v1/git/verySecret' + @api_url = 'https://api.flowdock.com/v1/messages' WebMock.stub_request(:post, @api_url) end it "should call FlowDock API" do @flowdock_service.execute(@sample_data) - expect(WebMock).to have_requested(:post, @api_url).with( - body: /#{@sample_data[:before]}.*#{@sample_data[:after]}.*#{project.path}/ - ).once + @sample_data[:commits].each do |commit| + # One request to Flowdock per new commit + next if commit[:id] == @sample_data[:before] + expect(WebMock).to have_requested(:post, @api_url).with( + body: /#{commit[:id]}.*#{project.path}/ + ).once + end end end end -- cgit v1.2.1 From adfcd572961acc14b2e1e2e2052a6e2e00cf9f79 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 14 Aug 2015 17:44:12 -0400 Subject: Bump omniauth-saml to 1.4.1 Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247 --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 6933930e253..5941365018d 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'omniauth-shibboleth' gem 'omniauth-kerberos', group: :kerberos gem 'omniauth-gitlab' gem 'omniauth-bitbucket' -gem 'omniauth-saml' +gem 'omniauth-saml', '~> 1.4.0' gem 'doorkeeper', '2.1.3' gem "rack-oauth2", "~> 1.0.5" diff --git a/Gemfile.lock b/Gemfile.lock index 043364a9689..c9a7e46409e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -426,9 +426,9 @@ GEM omniauth-oauth2 (1.1.1) oauth2 (~> 0.8.0) omniauth (~> 1.0) - omniauth-saml (1.3.1) + omniauth-saml (1.4.1) omniauth (~> 1.1) - ruby-saml (~> 0.8.1) + ruby-saml (~> 1.0.0) omniauth-shibboleth (1.1.1) omniauth (>= 1.0.0) omniauth-twitter (1.0.1) @@ -572,8 +572,8 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.1) - ruby-saml (0.8.2) - nokogiri (>= 1.5.0) + ruby-saml (1.0.0) + nokogiri (>= 1.5.10) uuid (~> 2.3) ruby2ruby (2.1.3) ruby_parser (~> 3.1) @@ -713,7 +713,7 @@ GEM raindrops (~> 0.7) unicorn-worker-killer (0.4.2) unicorn (~> 4) - uuid (2.3.7) + uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) virtus (1.0.1) @@ -817,7 +817,7 @@ DEPENDENCIES omniauth-gitlab omniauth-google-oauth2 omniauth-kerberos - omniauth-saml + omniauth-saml (~> 1.4.0) omniauth-shibboleth omniauth-twitter org-ruby (= 0.9.12) -- cgit v1.2.1 From 18e9b01059cb0e3012c825b7dd36a7c2f32e61df Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 15 Aug 2015 23:11:04 +0200 Subject: Update changelog for MR !1124 Signed-off-by: Sven Strickroth --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 70501908986..7c7f448b9be 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -58,6 +58,7 @@ v 7.14.0 (unreleased) - Fix: User search feature in admin area does not respect filters - Set max-width for README, issue and merge request description for easier read on big screens - Update Flowdock integration to support new Flowdock API (Boyan Tabakov) + - Remove author from files view (Sven Strickroth) v 7.13.5 - Satellites reverted -- cgit v1.2.1 From 33c818d2d8593f4926e6ad0888f21b331b8700ff Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 15 Aug 2015 20:04:19 -0400 Subject: Require Ruby 2.1.0 in `gitlab:app:check` task [ci skip] --- lib/tasks/gitlab/check.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index badb47c6779..d19695f92fb 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -749,7 +749,7 @@ namespace :gitlab do end def check_ruby_version - required_version = Gitlab::VersionInfo.new(2, 0, 0) + required_version = Gitlab::VersionInfo.new(2, 1, 0) current_version = Gitlab::VersionInfo.parse(run(%W(ruby --version))) print "Ruby version >= #{required_version} ? ... " -- cgit v1.2.1