Merge 5.0.1 into 5.1 (!3933) · Merge requests · gpt / large_projects / gitlabhq1

Closed gitlab-qa-bot requested to merge github/fork/scmcoord/5-1-merge-5-0 into 5-1-stable 11 years ago

May 14, 2013

Merge remote branch 'upstream/5-0-stable' into 5-1-stable · d381e032

Pelle Johansson authored 11 years ago

Conflicts:
	lib/tasks/gitlab/migrate_wiki.rake
	lib/wiki_to_gollum_migrator.rb
	spec/lib/wiki_to_gollum_migrator_spec.rb

d381e032

Apr 26, 2013
- Merge pull request #3719 from DanKnox/add_safe_wiki_migration · 0702bd67
  Dmitriy Zaporozhets authored 11 years ago
  
  Add a safe migration mode to the wiki migrator.
  0702bd67
Apr 25, 2013
- Ensure old revisions are retrieved from the DB in the correct order. · 58ca7553
  Dan Knox authored 11 years ago
  
  58ca7553
Apr 24, 2013

Add a safe migration mode to the wiki migrator. · db577200

Dan Knox authored 11 years ago

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

db577200

Apr 07, 2013
- Merge pull request #3535 from boldt/5-0-stable · 951273ff
  Dmitriy Zaporozhets authored 11 years ago
  
  Fixed check.rake due to #3530
  951273ff
Apr 06, 2013
- Fixed check.rake due to #3530 · 1daa75fd
  Dennis Boldt authored 11 years ago
  
  1daa75fd
- fix resicpes to point 5-0-stable branch · b6e71360
  Dmitriy Zaporozhets authored 11 years ago
  
  b6e71360
Apr 04, 2013
- 5.0.1 · 907a8f42
  Dmitriy Zaporozhets authored 11 years ago
  
  907a8f42
Mar 30, 2013
- fix gollum · 8b761574
  Dmitriy Zaporozhets authored 11 years ago
  
  8b761574
- Use latest gitlab-grit fork to prevent gollum override gitlab-grit. Fixes... · 34136d38
  Dmitriy Zaporozhets authored 11 years ago
  
  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
  34136d38
- Merge pull request #3441 from Finkregh/patch-2 · 65156e36
  Dmitriy Zaporozhets authored 11 years ago
  
  switch gitlab-shell to correct version
  65156e36
Mar 28, 2013
- switch gitlab-shell to correct version · 6a09b21d
  Oluf Lorenzen authored 11 years ago
  
  a gitlab:check does say that you need v1.1.0 of gitlab-shell...
  6a09b21d
Mar 25, 2013
- Merge pull request #3367 from koenpunt/patch-1 · 46063803
  Saito authored 11 years ago
  
  Fixed typo
  46063803
- Fixed type · 017c19bb
  Koen Punt authored 11 years ago
  
  017c19bb
Mar 22, 2013
- fix xss issue in blame · 0c7f4260
  Dmitriy Zaporozhets authored 11 years ago
  
  0c7f4260
- fix blame view head nav · 5c49cf6c
  Dmitriy Zaporozhets authored 11 years ago
  
  5c49cf6c
- Fix lines and line numbers being squashed in File -> blame · 0e4b2395
  Dmitriy Zaporozhets authored 11 years ago
  
  0e4b2395
- fix commit-description css on commit.show · ef968fd0
  Dmitriy Zaporozhets authored 11 years ago
  
  ef968fd0

Admin message

Admin message

Merge 5.0.1 into 5.1

Merge request reports

Activity