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
89ce02ea5d
Merge pull request #3158 from dosire/master
...
Use secure protocol
2013-03-06 10:22:45 -08:00
Sytse Sijbrandij
bcaf3c2c3e
Use secure protocol
2013-03-06 17:55:11 +01: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
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
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
Dmitriy Zaporozhets
71bd956866
email via sidekiq. start and stop rake tasks
2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets
c7bb3a1f72
sidekiq
2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
ab344f31b6
Rails upto 3.2.11
2013-01-09 11:07:55 +02:00
Dmitriy Zaporozhets
47dd9e42f7
Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update
...
Conflicts:
Gemfile.lock
2013-01-05 23:17:50 +02:00
Dmitriy Zaporozhets
de05a598b3
Update to rails 3.2.10. Use simplercov in spinach too
2013-01-05 13:30:42 +02:00
Koen Punt
47bb945caf
raphael from gitlabhq
2013-01-04 13:59:08 +01:00
Koen Punt
f04597d918
updated raphael
...
better labels
2013-01-04 13:59:08 +01:00
Dmitriy Zaporozhets
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets
64db5f808b
use gitlab omniauth-ldap gem instead of fork
2012-12-30 15:15:56 +02:00
Dmitriy Zaporozhets
d863fa6283
Replace yaml_db fork with gem
2012-12-30 14:54:08 +02:00
Dmitriy Zaporozhets
96d49bf04c
Use sdoc to generate application code documentation
2012-12-30 14:43:00 +02:00
Dmitriy Zaporozhets
5cd823847b
Use gitlab resque fork. Added rake task to stop all workers
2012-12-26 11:23:43 +02:00
Andrey Kumanyaev
9ff1ec7d8e
Added gems better_errors and binding_of_caller
2012-12-26 02:42:53 +04:00
Dmitriy Zaporozhets
3c1022f9b1
No resque errors
2012-12-25 16:18:22 +02:00
Dmitriy Zaporozhets
552c6d4598
Make tests green for postgres
2012-12-18 20:43:44 +02:00
Riyad Preukschas
c338321695
Update jquery-atwho-rails gem
...
Fixes #1860
2012-12-06 15:42:08 +01:00
Riyad Preukschas
2519fd8376
Update pygments.rb
...
Fixes #1774
2012-12-05 02:14:08 +01:00