OSDN Git Service
Dan Knox [Thu, 14 Mar 2013 06:31:08 +0000 (23:31 -0700)]
Use Gitlab Markdown for Markdown files and Gollum to render the rest.
This commit enables the usage of the Gitlab Markdown post processing
on all Markdown formatted files. For file types that do not contain
Markdown, it defaults to the Gollum native renderer to process the
content.
Dan Knox [Mon, 11 Mar 2013 02:10:44 +0000 (19:10 -0700)]
Create Wiki migration task.
This commit adds a new Rake task for migrating all of your existing
Wiki content from your database into new Gollum repositories.
The bulk of the logic happens within the `WikiToGollumMigrator`
class which is decently test covered and located in the lib directory.
The new Rake task can be executed by running:
`bundle exec rake gitlab:wiki:migrate`
It will output a nice log of every project that it migrates along
with success or failure messages.
I have used it on my own installation to migrate my Wikis successfully.
Dan Knox [Sun, 10 Mar 2013 21:37:26 +0000 (14:37 -0700)]
Add Spinach coverage for Gollum Wiki system and correct the Delete link.
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.
The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.
The link has been corrected and all steps are now passing.
Dan Knox [Mon, 4 Mar 2013 03:43:52 +0000 (19:43 -0800)]
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.
Dmitriy Zaporozhets [Sat, 9 Mar 2013 22:12:25 +0000 (00:12 +0200)]
better logo images for header
Dmitriy Zaporozhets [Fri, 8 Mar 2013 11:14:47 +0000 (13:14 +0200)]
fix event relative date being cached
Dmitriy Zaporozhets [Fri, 8 Mar 2013 10:08:09 +0000 (02:08 -0800)]
Merge pull request #3173 from m4tthumphrey/patch-1
Added system hooks link to doc index
Matt Humphrey [Fri, 8 Mar 2013 09:37:00 +0000 (09:37 +0000)]
Added system hooks link to doc index
Dmitriy Zaporozhets [Thu, 7 Mar 2013 16:33:34 +0000 (08:33 -0800)]
Merge pull request #2835 from Asquera/fixes/api
Fix API return codes
Sebastian Ziebell [Thu, 7 Mar 2013 14:11:33 +0000 (15:11 +0100)]
API: fixes project creation and removed redundant info
Sebastian Ziebell [Thu, 7 Mar 2013 13:51:56 +0000 (14:51 +0100)]
Merge branch 'master' into fixes/api, code clean up and tests fixed
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
Dmitriy Zaporozhets [Thu, 7 Mar 2013 12:18:30 +0000 (14:18 +0200)]
block user should not be able to push
Dmitriy Zaporozhets [Thu, 7 Mar 2013 10:08:11 +0000 (02:08 -0800)]
Merge pull request #3047 from mikew/capistrano-deploy-example
Capistrano deploy example
Dmitriy Zaporozhets [Thu, 7 Mar 2013 09:55:19 +0000 (01:55 -0800)]
Merge pull request #3139 from rapofran/auto_focus_ldap_login
Autofocus to username input (LDAP login).
Dmitriy Zaporozhets [Thu, 7 Mar 2013 09:45:44 +0000 (11:45 +0200)]
fix stubbed repo
Dmitriy Zaporozhets [Thu, 7 Mar 2013 09:14:19 +0000 (11:14 +0200)]
remove last commit widget, added repo size and owner info on project home page
Dmitriy Zaporozhets [Thu, 7 Mar 2013 08:08:43 +0000 (10:08 +0200)]
show project description on public area
Dmitriy Zaporozhets [Thu, 7 Mar 2013 06:57:24 +0000 (22:57 -0800)]
Merge pull request #3146 from amacarthur/AdminAPIs
Additional Admin APIs
Dmitriy Zaporozhets [Thu, 7 Mar 2013 06:43:13 +0000 (22:43 -0800)]
Merge pull request #3159 from peikk0/allow-redis-via-socket
Allow connection to Redis via unix socket
Dmitriy Zaporozhets [Thu, 7 Mar 2013 06:31:25 +0000 (22:31 -0800)]
Merge pull request #3161 from cabello/patch-1
Refactor README to split production/development environments
Danilo Cabello [Thu, 7 Mar 2013 01:06:56 +0000 (20:06 -0500)]
Refactor README to split production/development environments
Sebastian Ziebell [Wed, 6 Mar 2013 23:15:57 +0000 (00:15 +0100)]
API: documentation contains infos to status codes in README file.
All the info to return codes from the API functions are available in the `README.md` file as suggested.
Pierre GUINOISEAU [Wed, 6 Mar 2013 21:06:12 +0000 (22:06 +0100)]
Allow connection to Redis via unix socket
Allow connection to Redis via unix socket, using
unix:/var/run/redis/redis.sock for example.
Default behaviour does not change, except that the full Redis URL must
be configured, with redis:// for tcp or unix: for unix socket.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 20:56:48 +0000 (22:56 +0200)]
Return project description back
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:48:15 +0000 (21:48 +0200)]
show highlighted code correctly inside issue body
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:39:10 +0000 (21:39 +0200)]
fix js syntax error
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:12:47 +0000 (21:12 +0200)]
add system hooks api docs to help content
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:10:01 +0000 (21:10 +0200)]
update Gemfile.lock with https rubygems
Dmitriy Zaporozhets [Wed, 6 Mar 2013 18:22:45 +0000 (10:22 -0800)]
Merge pull request #3158 from dosire/master
Use secure protocol
Sytse Sijbrandij [Wed, 6 Mar 2013 16:55:11 +0000 (17:55 +0100)]
Use secure protocol
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:43:45 +0000 (07:43 -0800)]
Merge pull request #3149 from m4tthumphrey/api-deploy-keys
Added methods to manage project deploy keys via API
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:42:43 +0000 (07:42 -0800)]
Merge pull request #3156 from m4tthumphrey/api-system-hooks
Added methods to manage system hooks from API
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:37:07 +0000 (07:37 -0800)]
Merge pull request #3157 from cabello/patch-1
Update README with references to versions.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:30:48 +0000 (17:30 +0200)]
Use redis as cache storage. cache events
Danilo Cabello [Wed, 6 Mar 2013 15:20:46 +0000 (10:20 -0500)]
Update README with references to versions.
Matt Humphrey [Wed, 6 Mar 2013 10:33:32 +0000 (10:33 +0000)]
System hooks API.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:12:28 +0000 (17:12 +0200)]
Fix loading animation while browsing tree
Dmitriy Zaporozhets [Wed, 6 Mar 2013 13:08:09 +0000 (05:08 -0800)]
Merge pull request #3154 from hiroponz/fix-routing-error
Fix routing error
Sato Hiroyuki [Wed, 6 Mar 2013 06:17:01 +0000 (15:17 +0900)]
Adding sleep statements to allow sufficient time for the page to settle.
Sato Hiroyuki [Wed, 6 Mar 2013 04:53:30 +0000 (13:53 +0900)]
Don't set format manually, bacause set in routing.
Sato Hiroyuki [Wed, 6 Mar 2013 04:42:45 +0000 (13:42 +0900)]
Fix routing errors.
It should fix #2598.
Sato Hiroyuki [Wed, 6 Mar 2013 03:59:28 +0000 (12:59 +0900)]
Add and fix some tests for routing.
It is linked to #2598.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 07:12:14 +0000 (09:12 +0200)]
fix public projects identations
Angus MacArthur [Wed, 6 Mar 2013 04:48:40 +0000 (23:48 -0500)]
Updated documentation for added Admin APIs
Sebastian Ziebell [Tue, 5 Mar 2013 22:43:05 +0000 (23:43 +0100)]
API: refactored and simplified error handling in merge requests API
Sebastian Ziebell [Tue, 5 Mar 2013 21:33:45 +0000 (22:33 +0100)]
Fixes api
Sebastian Ziebell [Tue, 5 Mar 2013 21:29:49 +0000 (22:29 +0100)]
Merge branch 'master' into fixes/api
Conflicts:
lib/api/projects.rb
Matt Humphrey [Tue, 5 Mar 2013 21:23:29 +0000 (21:23 +0000)]
Project deploy keys API
Angus MacArthur [Wed, 14 Nov 2012 20:37:52 +0000 (15:37 -0500)]
Additional Admin APIs
Dmitriy Zaporozhets [Tue, 5 Mar 2013 15:28:13 +0000 (17:28 +0200)]
reduce letter-spacing for top nav
Dmitriy Zaporozhets [Tue, 5 Mar 2013 15:15:20 +0000 (17:15 +0200)]
tree_heleper: concat html only if present. Avoid nil exception
Dmitriy Zaporozhets [Tue, 5 Mar 2013 15:06:22 +0000 (17:06 +0200)]
better solution for #3027
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:54:31 +0000 (06:54 -0800)]
Merge pull request #2870 from mikew/relative-url-root-default
default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:52:41 +0000 (06:52 -0800)]
Merge pull request #3106 from davidosomething/patch-1
Update doc/install/databases.md
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:50:46 +0000 (16:50 +0200)]
Merge branch 'gliptak-omniauth_no_email_1'
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:50:37 +0000 (16:50 +0200)]
fixed omniauth email spec
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:48:18 +0000 (16:48 +0200)]
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:40:13 +0000 (06:40 -0800)]
Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc
fix: grouping commits by date desc doesn't sort the groups too
Dmitriy Zaporozhets [Tue, 5 Mar 2013 13:52:01 +0000 (05:52 -0800)]
Merge pull request #2954 from cabeca/fix-image-url-emoji
Fix image url for emoji.
Dmitriy Zaporozhets [Tue, 5 Mar 2013 13:38:16 +0000 (05:38 -0800)]
Merge pull request #3143 from Undev/state-machine-3
State machine 3
Dmitriy Zaporozhets [Tue, 5 Mar 2013 11:16:56 +0000 (13:16 +0200)]
remove custom font
Andrew8xx8 [Tue, 5 Mar 2013 10:29:44 +0000 (14:29 +0400)]
Typo fixed
Dmitriy Zaporozhets [Tue, 5 Mar 2013 07:27:06 +0000 (09:27 +0200)]
Prevent app crash if team owner removed
Dmitriy Zaporozhets [Tue, 5 Mar 2013 07:02:27 +0000 (23:02 -0800)]
Merge pull request #3109 from hiroponz/improve-network-graph
Improve network graph
J. Francisco Raposerias [Mon, 4 Mar 2013 20:54:26 +0000 (17:54 -0300)]
add autofocus to username input
Dmitriy Zaporozhets [Mon, 4 Mar 2013 20:18:53 +0000 (22:18 +0200)]
Make clone widget read-only
Dmitriy Zaporozhets [Mon, 4 Mar 2013 20:00:51 +0000 (22:00 +0200)]
better event-notes typography
Dmitriy Zaporozhets [Mon, 4 Mar 2013 19:34:26 +0000 (21:34 +0200)]
use md-typography for note content
Dmitriy Zaporozhets [Mon, 4 Mar 2013 19:12:36 +0000 (21:12 +0200)]
= preserve do was ignored for empty project page so was replaced with filter
Dmitriy Zaporozhets [Mon, 4 Mar 2013 19:11:03 +0000 (21:11 +0200)]
Fix dark color bg for wiki
Dmitriy Zaporozhets [Mon, 4 Mar 2013 18:11:23 +0000 (20:11 +0200)]
add link ti public area
Dmitriy Zaporozhets [Mon, 4 Mar 2013 17:47:20 +0000 (19:47 +0200)]
Fix edit team page
Andrew8xx8 [Mon, 4 Mar 2013 14:52:30 +0000 (18:52 +0400)]
User's blocked field refactored to use state machine
Andrew8xx8 [Mon, 4 Mar 2013 14:51:00 +0000 (18:51 +0400)]
Migrations added
Sato Hiroyuki [Mon, 4 Mar 2013 08:50:42 +0000 (17:50 +0900)]
Add some tests for network graph
Dmitriy Zaporozhets [Mon, 4 Mar 2013 06:56:54 +0000 (08:56 +0200)]
use grit_ext gem instead of fork
Dmitriy Zaporozhets [Mon, 4 Mar 2013 06:54:00 +0000 (08:54 +0200)]
Use gitlab-pygments gem
Dmitriy Zaporozhets [Sun, 3 Mar 2013 20:08:04 +0000 (22:08 +0200)]
use gitlab-grack gem
Dmitriy Zaporozhets [Sun, 3 Mar 2013 20:01:20 +0000 (22:01 +0200)]
Use gem for gitlab grit
Dmitriy Zaporozhets [Sun, 3 Mar 2013 16:36:26 +0000 (08:36 -0800)]
Merge pull request #3126 from dosire/refer-to-vagrant-vm
Refer to virtual machine from the installation document.
Dmitriy Zaporozhets [Sun, 3 Mar 2013 16:35:27 +0000 (08:35 -0800)]
Merge pull request #3123 from wtw/patch-1
Corrected some typos in gitlab.yml.example comments
Dmitriy Zaporozhets [Sun, 3 Mar 2013 16:22:56 +0000 (18:22 +0200)]
README code in lists
Dmitriy Zaporozhets [Sun, 3 Mar 2013 16:21:36 +0000 (18:21 +0200)]
fix readme code nesting
Dmitriy Zaporozhets [Sun, 3 Mar 2013 15:51:24 +0000 (17:51 +0200)]
Use proper markdown syntax for code in README.md
Dmitriy Zaporozhets [Sun, 3 Mar 2013 15:48:25 +0000 (07:48 -0800)]
Merge pull request #3125 from dosire/development-doc-in-repo
Development doc in repo
Sytse Sijbrandij [Sun, 3 Mar 2013 11:38:01 +0000 (12:38 +0100)]
Refer to virtual machine from the installation document.
Sytse Sijbrandij [Sun, 3 Mar 2013 11:29:57 +0000 (12:29 +0100)]
Sidekiq replaced resque.
Sytse Sijbrandij [Sat, 2 Mar 2013 22:38:48 +0000 (23:38 +0100)]
Small fixes and better quoting.
Sytse Sijbrandij [Sat, 2 Mar 2013 22:27:52 +0000 (23:27 +0100)]
Replacing the development guide.
Dmitriy Zaporozhets [Sat, 2 Mar 2013 18:48:22 +0000 (10:48 -0800)]
Merge pull request #3118 from 2called-chaos/dont_send_mails_twice
Do not send issue status mail twice if author = assignee
Dmitriy Zaporozhets [Sat, 2 Mar 2013 18:47:19 +0000 (10:47 -0800)]
Merge pull request #3119 from m4tthumphrey/patch-1
Add namespace_id to project creation via API
Dmitriy Zaporozhets [Sat, 2 Mar 2013 18:45:38 +0000 (10:45 -0800)]
Merge pull request #3124 from dosire/comprehensive-readme
Cleaned up and enhanced readme.
Sytse Sijbrandij [Sat, 2 Mar 2013 11:53:27 +0000 (12:53 +0100)]
Cleaned up and enhanced readme.
Finishing touches.
Make the layout more consistent.
Dmitriy Zaporozhets [Sat, 2 Mar 2013 11:23:30 +0000 (13:23 +0200)]
fix decorate call for milestone users
Dmitriy Zaporozhets [Sat, 2 Mar 2013 10:58:47 +0000 (12:58 +0200)]
Updated gems: omniauth, sinatra, foreman
wtw [Fri, 1 Mar 2013 22:53:37 +0000 (23:53 +0100)]
Corrected some typos in gitlab.yml.example comments
Matt Humphrey [Fri, 1 Mar 2013 16:36:19 +0000 (16:36 +0000)]
Missed comma.
Matt Humphrey [Fri, 1 Mar 2013 16:34:11 +0000 (16:34 +0000)]
Added namespace_id to project creation via API
This allows you to set the namespace ID for projects via the the API. By default it is created for the current user. You can assign it to the global namespace by passing `GLN` which translates to 'Global Namespace'.
Dmitriy Zaporozhets [Fri, 1 Mar 2013 14:26:39 +0000 (16:26 +0200)]
Merge branch 'Undev-team-and-group-descriptions'
Dmitriy Zaporozhets [Fri, 1 Mar 2013 14:26:26 +0000 (16:26 +0200)]
better presenting for group description