Commit graph

216 commits

Author SHA1 Message Date
Douglas Huff abc47852a9 Update deps for therubyracer and libv8 to resolve build issues on FreeBSD. Resolves Iussue#3446 . 2013-03-30 18:54:12 -07:00
Dmitriy Zaporozhets e998257dcf use rollbacked version of grit to make gollum works 2013-03-30 16:35:19 +02:00
Dmitriy Zaporozhets 66a1b88393 Update a grit to newer version 2013-03-30 12:50:44 +02:00
Dmitriy Zaporozhets 49f14f057d Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it too. Fixes things with gpg singatured commits, etc. 2013-03-29 08:47:14 +02:00
Dmitriy Zaporozhets a18ce40943 Revert "First step with rugged"
This reverts commit 4524ba20b8.
2013-03-28 23:01:42 +02:00
Dmitriy Zaporozhets 4524ba20b8 First step with rugged 2013-03-28 21:57:38 +02:00
Dmitriy Zaporozhets 2b2d43ed2a Update develoment dependencies 2013-03-27 22:21:32 +02:00
Dmitriy Zaporozhets ed7a2136dd update sidekiq 2013-03-27 21:51:40 +02:00
Andrew8xx8 5949e30243 Spork support added 2013-03-26 13:38:42 +04:00
Saito 7a4f70d79b bump version of grit_ext 2013-03-26 01:12:29 +08:00
Dmitriy Zaporozhets 979dcdba95 security update of crack gem 2013-03-24 11:24:26 +02:00
Austin Robertson ba1dbd39fb Change Gemfile.lock repo to use https:// 2013-03-22 10:38:27 -05:00
Dmitriy Zaporozhets fb4f171587 rails up to 3.2.13 2013-03-19 18:52:17 +02:00
Dmitriy Zaporozhets 699c9cd499 Gemfile.lock with gollum 2013-03-15 18:50:45 +02:00
Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb
2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets 67e2cf8864 select2-rails gem added 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets 96fbef60f9 add coveralls.io to travis builds 2013-03-10 20:26:27 +02:00
Dan Knox ea9b3687db Replace current Wiki system with Gollum Wikis.
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.

The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:

* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.

The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
2013-03-09 16:39:51 -08:00
Dmitriy Zaporozhets 08f29c322e update Gemfile.lock with https rubygems 2013-03-06 21:10:01 +02:00
Dmitriy Zaporozhets 4c1538a946 Use redis as cache storage. cache events 2013-03-06 17:30:48 +02:00
Dmitriy Zaporozhets 152c6018b3 use grit_ext gem instead of fork 2013-03-04 08:56:54 +02:00
Dmitriy Zaporozhets d199de0444 Use gitlab-pygments gem 2013-03-04 08:54:00 +02:00
Dmitriy Zaporozhets 282b804556 use gitlab-grack gem 2013-03-03 22:08:04 +02:00
Dmitriy Zaporozhets 512ab1b61a Use gem for gitlab grit 2013-03-03 22:01:20 +02:00
Dmitriy Zaporozhets 86da625f1d Updated gems: omniauth, sinatra, foreman 2013-03-02 12:58:47 +02:00
Dmitriy Zaporozhets 520f02259c gems updated: unicorn, draper, github-markup 2013-03-01 15:15:29 +02:00
Dmitriy Zaporozhets 153a4c142d updated gems: haml-rails, carrierwave 2013-03-01 15:09:11 +02:00
Dmitriy Zaporozhets 5da7424f8d Gem updated: devise, grape, sidekiq, settingslogic 2013-03-01 14:36:12 +02:00
Dmitriy Zaporozhets 0b52c461da use grit_ext 0.6.2 2013-03-01 09:23:18 +02:00
Dmitriy Zaporozhets 7a0af60b51 update stamp 2013-02-28 21:14:00 +02:00
Dmitriy Zaporozhets 547ae558d7 update httparty 2013-02-28 21:11:12 +02:00
Dmitriy Zaporozhets ed9543ff5d update devise gem 2013-02-28 21:06:16 +02:00
Dmitriy Zaporozhets 00ae65b108 try to use stable version for database cleaner 2013-02-28 21:02:41 +02:00
Dmitriy Zaporozhets e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
Conflicts:
	Gemfile.lock
2013-02-28 17:02:20 +02:00
Andrew8xx8 cf3cf3750e Gem gon added. It produces server-side variable values in javascript 2013-02-28 16:11:14 +04:00
Andrew8xx8 8f621c9e06 Enumerize gem added 2013-02-28 15:15:53 +04:00
Ezekiel Templin 70e1b3b1cb Update binding_of_caller version
Updating this dependency fixed my Ruby 2.0 installation issues.
2013-02-27 14:32:36 -05:00
Kazuhiko 3b548d9251 update grape to 0.3.1 for ruby 2.0 support.
add grape-entity, that is split from grape 0.3.0.
remove usage of deprecated error_format, that is removed in grape 0.2.3.
2013-02-26 21:31:45 +01:00
Dmitriy Zaporozhets 580a56b6ff Update grit to handle symlinks 2013-02-25 19:44:37 +02:00
Dmitriy Zaporozhets 262f80a68a Update grit for ruby 2.0 support 2013-02-25 19:22:46 +02:00
Dmitriy Zaporozhets be817c53c6 Update database cleaner. Remove postgres from travis build list since it gives us deadlocks always 2013-02-21 14:11:04 +02:00
Dmitriy Zaporozhets 830da0c218 Update capybara, poltergeist, spinach, rspec-rails 2013-02-21 10:28:13 +02:00
Dmitriy Zaporozhets af3138e801 Update sidekiq 2013-02-21 10:00:18 +02:00
Andrew8xx8 26d4574ada State machine gem added 2013-02-18 14:43:49 +04:00
Dmitriy Zaporozhets 06d9ccf484 Rails up to 3.2.12 2013-02-11 23:17:34 +02:00
Dmitriy Zaporozhets 2f0a75ab77 GitLab meta to 5.0 2013-02-08 08:55:39 +02:00
Dmitriy Zaporozhets 6b9a609044 preparing for gitlab-shell 2013-02-04 14:28:10 +02:00
Dmitriy Zaporozhets 54a24608a2 Remove chdir inside runtime. Improved gitolite shell commands 2013-01-19 13:56:55 +02:00
Dmitriy Zaporozhets e98d478085 remove thin from production env. Use unicorn for foreman 2013-01-14 20:21:04 +02:00
Dmitriy Zaporozhets abc2bdc3aa Remove unused images. More use of font-awesome icons 2013-01-10 08:43:25 +02:00