From ef968fd0c8a61d63283e9f7aba4a07809d87bc16 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 21 Mar 2013 22:22:21 +0200
Subject: [PATCH 01/14] fix commit-description css on commit.show
---
app/assets/stylesheets/sections/commits.scss | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 0df39298c89..1e564188892 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -413,3 +413,9 @@
padding: 4px;
background-color: #EEE;
}
+
+.commit-description {
+ background: none;
+ border: none;
+ margin: 0;
+}
--
GitLab
From 0e4b2395a9612d67255f5101452a2e79334c4352 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 22 Mar 2013 15:08:02 +0200
Subject: [PATCH 02/14] Fix lines and line numbers being squashed in File ->
blame
---
app/views/blame/show.html.haml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/views/blame/show.html.haml b/app/views/blame/show.html.haml
index 36d81e6af38..62516266536 100644
--- a/app/views/blame/show.html.haml
+++ b/app/views/blame/show.html.haml
@@ -38,9 +38,11 @@
- current_line += 1
- else
- lines.each do |line|
- = current_line
+ :preserve
+ #{current_line}
- current_line += 1
%td.lines
%pre
- lines.each do |line|
- = line
+ :preserve
+ #{line}
--
GitLab
From 5c49cf6ca170aba7646f53d02130c79c0c4470a6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 22 Mar 2013 15:11:16 +0200
Subject: [PATCH 03/14] fix blame view head nav
---
app/views/blame/_head.html.haml | 9 ++-------
app/views/blame/show.html.haml | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/app/views/blame/_head.html.haml b/app/views/blame/_head.html.haml
index ef9e6c9c532..3a883829562 100644
--- a/app/views/blame/_head.html.haml
+++ b/app/views/blame/_head.html.haml
@@ -1,7 +1,2 @@
-%ul.nav.nav-tabs
- %li
- = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
- = nav_link(controller: :refs) do
- = link_to 'Source', project_tree_path(@project, @ref)
- %li.pull-right
- = render "shared/clone_panel"
+%div.tree-ref-holder
+ = render 'shared/ref_switcher', destination: 'tree', path: params[:path]
diff --git a/app/views/blame/show.html.haml b/app/views/blame/show.html.haml
index 62516266536..f85dde6dbbf 100644
--- a/app/views/blame/show.html.haml
+++ b/app/views/blame/show.html.haml
@@ -3,7 +3,7 @@
#tree-holder.tree-holder
%ul.breadcrumb
%li
- %span.arrow
+ %i.icon-angle-right
= link_to project_tree_path(@project, @ref) do
= @project.name
- @tree.breadcrumbs(6) do |link|
--
GitLab
From 0c7f426037db668fbd9ad11376b4db0007baafce Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 22 Mar 2013 18:52:25 +0200
Subject: [PATCH 04/14] fix xss issue in blame
---
app/views/blame/show.html.haml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/blame/show.html.haml b/app/views/blame/show.html.haml
index f85dde6dbbf..b2a45ef5303 100644
--- a/app/views/blame/show.html.haml
+++ b/app/views/blame/show.html.haml
@@ -38,11 +38,11 @@
- current_line += 1
- else
- lines.each do |line|
- :preserve
- #{current_line}
+ = current_line
+ \
- current_line += 1
%td.lines
%pre
- lines.each do |line|
- :preserve
- #{line}
+ = line
+ \
--
GitLab
From 017c19bbe4e9098e161b8cc0e866d644e7d3ae95 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Mon, 25 Mar 2013 12:00:57 +0100
Subject: [PATCH 05/14] Fixed type
---
doc/install/installation.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 69d3b186b32..a0ff9a26870 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -1,6 +1,6 @@
This installation guide was created for Debian/Ubuntu and tested on it. Please read [`doc/install/requirements.md`](./requirements.md) for hardware and platform requirements.
-This installation guide is recommended to set up a production server. If you want a development environment please use the [Vargrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm) since it makes it much easier to set up all the dependencies for integration testing.
+This installation guide is recommended to set up a production server. If you want a development environment please use the [Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm) since it makes it much easier to set up all the dependencies for integration testing.
**Important Note:**
The following steps have been known to work.
--
GitLab
From 6a09b21df677e5115f46d3e52ffaf553f4276f85 Mon Sep 17 00:00:00 2001
From: Oluf Lorenzen <fink.github.com@mafia-server.net>
Date: Thu, 28 Mar 2013 18:53:26 +0100
Subject: [PATCH 06/14] switch gitlab-shell to correct version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
a gitlab:check does say that you need v1.1.0 of gitlab-shell...
---
doc/install/installation.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index a0ff9a26870..853a6e78364 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -106,6 +106,11 @@ GitLab Shell is a ssh access and repository management software developed specia
git clone https://github.com/gitlabhq/gitlab-shell.git
cd gitlab-shell
+
+ # switch to right version for v5.0
+ git checkout v1.1.0
+ git checkout -b v1.1.0
+
cp config.yml.example config.yml
# Edit config and replace gitlab_url
--
GitLab
From 34136d381fe733e7465700a043c7a3a27c8c0ec6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 30 Mar 2013 13:14:19 +0200
Subject: [PATCH 07/14] Use latest gitlab-grit fork to prevent gollum override
gitlab-grit. Fixes issues related to gpg signed commits and other fixes from
gitlab/grit fork
---
Gemfile | 3 ++-
Gemfile.lock | 20 +++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index 7f92cb75d30..494f331ef2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
# Extracting information from a git repository
-gem "gitlab-grit", '~> 1.0.0', require: 'grit'
+# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
+gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c15e2758ec75f99230cd0fbcc9110bf932c0bf05'
gem 'grit_ext', '~> 0.6.2'
# Ruby/Rack Git Smart-HTTP Server Handler
diff --git a/Gemfile.lock b/Gemfile.lock
index 4de5c893ff8..7b779dbcad9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,6 +23,16 @@ GIT
activerecord (>= 2.3.0)
rake (>= 0.8.7)
+GIT
+ remote: https://github.com/gitlabhq/grit.git
+ revision: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
+ ref: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
+ specs:
+ grit (2.5.0)
+ diff-lcs (~> 1.1)
+ mime-types (~> 1.15)
+ posix-spawn (~> 0.3.6)
+
GIT
remote: https://github.com/gitlabhq/raphael-rails.git
revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
@@ -166,10 +176,6 @@ GEM
github-markup (0.7.5)
gitlab-grack (1.0.0)
rack (~> 1.4.1)
- gitlab-grit (1.0.0)
- diff-lcs (~> 1.1)
- mime-types (~> 1.15)
- posix-spawn (~> 0.3.6)
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
@@ -194,10 +200,6 @@ GEM
grape-entity (0.2.0)
activesupport
multi_json (>= 1.3.2)
- grit (2.5.0)
- diff-lcs (~> 1.1)
- mime-types (~> 1.15)
- posix-spawn (~> 0.3.6)
grit_ext (0.6.2)
charlock_holmes (~> 0.6.9)
growl (1.0.3)
@@ -521,7 +523,6 @@ DEPENDENCIES
github-linguist (~> 2.3.4)
github-markup (~> 0.7.4)
gitlab-grack (~> 1.0.0)
- gitlab-grit (~> 1.0.0)
gitlab-pygments.rb (~> 0.3.2)
gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.2)
@@ -530,6 +531,7 @@ DEPENDENCIES
gon
grape (~> 0.3.1)
grape-entity (~> 0.2.0)
+ grit (~> 2.5.0)!
grit_ext (~> 0.6.2)
growl
guard-rspec
--
GitLab
From 8b761574bd629cf5a6ddb0e169fff019d55ad415 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 30 Mar 2013 16:37:41 +0200
Subject: [PATCH 08/14] fix gollum
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 494f331ef2a..e1e5bba238f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
-gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c15e2758ec75f99230cd0fbcc9110bf932c0bf05'
+gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: 'c40a32432616a07fa7fc3c32c24ab73ad6a9718f'
gem 'grit_ext', '~> 0.6.2'
# Ruby/Rack Git Smart-HTTP Server Handler
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b779dbcad9..9614a07c5fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,8 +25,8 @@ GIT
GIT
remote: https://github.com/gitlabhq/grit.git
- revision: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
- ref: c15e2758ec75f99230cd0fbcc9110bf932c0bf05
+ revision: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
+ ref: c40a32432616a07fa7fc3c32c24ab73ad6a9718f
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
--
GitLab
From 907a8f42a2224dc8ec796717213bf02388c1c364 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 4 Apr 2013 11:10:09 +0300
Subject: [PATCH 09/14] 5.0.1
---
CHANGELOG | 3 +++
VERSION | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 62792fcf5a6..dbe60f4650b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v 5.0.1
+ - Fixed issue with gitlab-grit being overrided by grit
+
v 5.0.0
- Replaced gitolite with gitlab-shell
- Removed gitolite-related libraries
diff --git a/VERSION b/VERSION
index 0062ac97180..6b244dcd696 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.0
+5.0.1
--
GitLab
From b6e71360b4929ad9ebd9aa0ce49d94c9bac7b577 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 6 Apr 2013 10:25:33 +0300
Subject: [PATCH 10/14] fix resicpes to point 5-0-stable branch
---
doc/install/installation.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 853a6e78364..0ddd2cc5462 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -208,7 +208,7 @@ Make sure to update username/password in config/database.yml.
Download the init script (will be /etc/init.d/gitlab):
- sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab
+ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/5-0-stable/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
Make GitLab start on boot:
@@ -249,7 +249,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
Download an example site config:
- sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab
+ sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/5-0-stable/nginx/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
Make sure to edit the config file to match your setup:
--
GitLab
From 1daa75fd156cf93e6ec85cf660a845928b8be9f3 Mon Sep 17 00:00:00 2001
From: Dennis Boldt <info@dennis-boldt.de>
Date: Sat, 6 Apr 2013 12:47:57 +0200
Subject: [PATCH 11/14] Fixed check.rake due to #3530
---
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 855227fb34f..b30079ff483 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -142,7 +142,7 @@ namespace :gitlab do
return
end
- recipe_content = `curl https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab 2>/dev/null`
+ recipe_content = `curl https://raw.github.com/gitlabhq/gitlab-recipes/5-0-stable/init.d/gitlab 2>/dev/null`
script_content = File.read(script_path)
if recipe_content == script_content
--
GitLab
From db577200848ae9c936763a58129354db9e46fbfc Mon Sep 17 00:00:00 2001
From: Dan Knox <dknox@threedotloft.com>
Date: Wed, 24 Apr 2013 13:29:40 -0700
Subject: [PATCH 12/14] Add a safe migration mode to the wiki migrator.
The safe migrate mode can be invoked by setting the
safe_migrate environment variable to 'true' on the command
line when running the task.
RAILS_ENV=production rake gitlab:wiki:migrate
---
lib/tasks/gitlab/migrate_wiki.rake | 8 +-
lib/wiki_to_gollum_migrator.rb | 12 ++-
spec/lib/wiki_to_gollum_migrator_spec.rb | 94 ++++++++++++++++++++++++
3 files changed, 112 insertions(+), 2 deletions(-)
diff --git a/lib/tasks/gitlab/migrate_wiki.rake b/lib/tasks/gitlab/migrate_wiki.rake
index 5d9881e45db..9198a398c82 100644
--- a/lib/tasks/gitlab/migrate_wiki.rake
+++ b/lib/tasks/gitlab/migrate_wiki.rake
@@ -11,7 +11,13 @@ namespace :gitlab do
# Notes:
# * The existing Wiki content will remain in your
# database in-tact.
- desc "GITLAB | Migrate Wiki content from database to Gollum repositories."
+ # * If the migration does not work the first time,
+ # run the `RAILS_ENV=production rake gitlab:wiki:rollback`
+ # command and then execute the migration again with
+ # the safe_migrate=true environment variable:
+ #
+ # `RAILS_ENV=production rake gitlab:wiki:migrate safe_migrate=true`
+ desc "GITLAB | Migrate Wiki content from database to Gollum repositories. Use the safe_migrate=true argument if initial migration fails."
task :migrate => :environment do
wiki_migrator = WikiToGollumMigrator.new
wiki_migrator.migrate!
diff --git a/lib/wiki_to_gollum_migrator.rb b/lib/wiki_to_gollum_migrator.rb
index ed6a1700631..f99b96e125e 100644
--- a/lib/wiki_to_gollum_migrator.rb
+++ b/lib/wiki_to_gollum_migrator.rb
@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
class WikiToGollumMigrator
attr_reader :projects
@@ -84,7 +86,7 @@ class WikiToGollumMigrator
# and revision created so the correct User is shown in
# the commit message.
wiki = GollumWiki.new(project, revision.user)
- wiki_page = wiki.find_page(page.slug)
+ wiki_page = wiki.find_page(page.title)
attributes = extract_attributes_from_page(revision, project)
@@ -103,6 +105,10 @@ class WikiToGollumMigrator
.with_indifferent_access
.slice(:title, :content)
+ if ENV["safe_migrate"] == "true"
+ attributes[:title] = gollum_safe_title(attributes[:title])
+ end
+
slug = page.slug
# Change 'index' pages to 'home' pages to match Gollum standards
@@ -113,6 +119,10 @@ class WikiToGollumMigrator
attributes
end
+ def gollum_safe_title(title)
+ title.parameterize.titleize
+ end
+
def home_already_exists?(project)
project.wikis.where(slug: 'home').any? || project.wikis.where(slug: 'Home').any?
end
diff --git a/spec/lib/wiki_to_gollum_migrator_spec.rb b/spec/lib/wiki_to_gollum_migrator_spec.rb
index f9b9c78ea01..fac7339d615 100644
--- a/spec/lib/wiki_to_gollum_migrator_spec.rb
+++ b/spec/lib/wiki_to_gollum_migrator_spec.rb
@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
require "spec_helper"
describe WikiToGollumMigrator do
@@ -137,6 +139,98 @@ describe WikiToGollumMigrator do
end
end
+ context "when migrating wiki's with extra whitespace in the title" do
+ before do
+ subject.rollback!
+ ENV['safe_migrate'] = 'true'
+ @project = @projects.last
+ @page = @project.wikis.new(title: "2012-06-16 ", content: "Page with funky title")
+ @page.slug = @page.title.parameterize
+ @page.user = @project.owner
+ @page.save!
+
+ create_revision(@page)
+
+ subject.migrate!
+ end
+
+ it "creates the wiki page correctly" do
+ wiki = GollumWiki.new(@project, nil)
+ page = wiki.find_page("2012 06 16")
+ page.should be_present
+ page.versions.count.should == 2
+ end
+ end
+
+ context "when migrating wiki's with slashes in the title" do
+ before do
+ subject.rollback!
+ ENV['safe_migrate'] = 'true'
+ @project = @projects.last
+ @page = @project.wikis.new(title: "Awesome 1337 /bin/badass ", content: "Page with funky title")
+ @page.slug = @page.title.parameterize
+ @page.user = @project.owner
+ @page.save!
+
+ create_revision(@page)
+
+ subject.migrate!
+ end
+
+ it "creates the wiki page correctly" do
+ wiki = GollumWiki.new(@project, nil)
+ page = wiki.find_page("Awesome 1337 Bin Badass")
+ page.should be_present
+ page.versions.count.should == 2
+ end
+ end
+
+ context "when migrating wiki's with non alphanumeric characters in the title" do
+ before do
+ subject.rollback!
+ ENV['safe_migrate'] = 'true'
+ @project = @projects.last
+ @page = @project.wikis.new(title: "Awes@me-1337 #!/bin/badass? ", content: "Page with funky title")
+ @page.slug = @page.title.parameterize
+ @page.user = @project.owner
+ @page.save!
+
+ create_revision(@page)
+
+ subject.migrate!
+ end
+
+ it "creates the wiki page correctly" do
+ wiki = GollumWiki.new(@project, nil)
+ page = wiki.find_page("Awes Me 1337 Bin Badass")
+ page.should be_present
+ page.versions.count.should == 2
+ end
+ end
+
+ context "when migrating wiki's with non-english characters in the title" do
+ before do
+ subject.rollback!
+ ENV['safe_migrate'] = 'true'
+ @project = @projects.last
+ @page = @project.wikis.new(title: "Mögliche Aufteilung", content: "Page with funky title")
+ @page.slug = @page.title.parameterize
+ @page.user = @project.owner
+ @page.save!
+
+ create_revision(@page)
+
+ subject.migrate!
+ end
+
+ it "creates the wiki page correctly" do
+ wiki = GollumWiki.new(@project, nil)
+ page = wiki.find_page("Mogliche Aufteilung")
+ page.should be_present
+ page.versions.count.should == 2
+ end
+ end
+
context "changing wiki title from index to home" do
before do
@project = @projects.last
--
GitLab
From 58ca7553a46ec7e1c089877f1dce8f3af42f449a Mon Sep 17 00:00:00 2001
From: Dan Knox <dknox@threedotloft.com>
Date: Wed, 24 Apr 2013 17:20:43 -0700
Subject: [PATCH 13/14] Ensure old revisions are retrieved from the DB in the
correct order.
---
lib/wiki_to_gollum_migrator.rb | 2 +-
spec/lib/wiki_to_gollum_migrator_spec.rb | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/wiki_to_gollum_migrator.rb b/lib/wiki_to_gollum_migrator.rb
index f99b96e125e..8f9218bbc91 100644
--- a/lib/wiki_to_gollum_migrator.rb
+++ b/lib/wiki_to_gollum_migrator.rb
@@ -55,7 +55,7 @@ class WikiToGollumMigrator
def create_page_and_revisions(project, page)
# Grab all revisions of the page
- revisions = project.wikis.where(slug: page.slug).ordered.all
+ revisions = project.wikis.where(slug: page.slug).order('id desc').all
# Remove the first revision created from the array
# and use it to create the Gollum page. Each successive revision
diff --git a/spec/lib/wiki_to_gollum_migrator_spec.rb b/spec/lib/wiki_to_gollum_migrator_spec.rb
index fac7339d615..4740839bc77 100644
--- a/spec/lib/wiki_to_gollum_migrator_spec.rb
+++ b/spec/lib/wiki_to_gollum_migrator_spec.rb
@@ -149,7 +149,7 @@ describe WikiToGollumMigrator do
@page.user = @project.owner
@page.save!
- create_revision(@page)
+ 3.times { create_revision(@page) }
subject.migrate!
end
@@ -158,6 +158,7 @@ describe WikiToGollumMigrator do
wiki = GollumWiki.new(@project, nil)
page = wiki.find_page("2012 06 16")
page.should be_present
+ page.content.should == "Updated Content"
page.versions.count.should == 2
end
end
--
GitLab
From 01b7e2c820a5b6c91228772fe1a2b31c88c53626 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Mon, 11 Aug 2014 05:41:57 -0700
Subject: [PATCH 14/14] git -> https
Changes gems to use https path rather than git path. Git path does not
work behind some firewalls and/or proxies.
---
Gemfile | 2 +-
Gemfile.lock | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gemfile b/Gemfile
index e1e5bba238f..312b67767ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ gem 'settingslogic'
# github-linquist needs pygments 0.4.2 but Gollum 2.4.11
# requires pygments 0.3.2. The latest master Gollum has been updated
# to use pygments 0.4.2. Change this after next Gollum release.
-gem "gollum", "~> 2.4.0", git: "git://github.com/gollum/gollum.git", ref: "5dcd3c8c8f"
+gem "gollum", "~> 2.4.0", git: "https://github.com/gollum/gollum.git", ref: "5dcd3c8c8f"
# Misc
gem "foreman"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9614a07c5fa..bae30ac36ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
GIT
- remote: git://github.com/gollum/gollum.git
+ remote: https://github.com/gollum/gollum.git
revision: 5dcd3c8c8f68158e43ff79861279088ee56d0ebe
ref: 5dcd3c8c8f
specs:
--
GitLab