OSDN Git Service
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
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
Sven Pachnit [Thu, 17 Jan 2013 00:05:44 +0000 (01:05 +0100)]
Do not send issue status mail twice if author = assignee
Dmitriy Zaporozhets [Fri, 1 Mar 2013 14:07:55 +0000 (16:07 +0200)]
fixed db/schema
Dmitriy Zaporozhets [Fri, 1 Mar 2013 14:05:51 +0000 (16:05 +0200)]
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
Conflicts:
db/schema.rb
Dmitriy Zaporozhets [Fri, 1 Mar 2013 13:59:43 +0000 (15:59 +0200)]
draper raise now RuntimeError instead of NoMethodError
Dmitriy Zaporozhets [Fri, 1 Mar 2013 13:35:22 +0000 (15:35 +0200)]
use simple decorate on single commits
Dmitriy Zaporozhets [Fri, 1 Mar 2013 13:24:59 +0000 (15:24 +0200)]
fix decorate calls on collections after draper update
Dmitriy Zaporozhets [Fri, 1 Mar 2013 13:15:29 +0000 (15:15 +0200)]
gems updated: unicorn, draper, github-markup
Dmitriy Zaporozhets [Fri, 1 Mar 2013 13:09:11 +0000 (15:09 +0200)]
updated gems: haml-rails, carrierwave
Dmitriy Zaporozhets [Fri, 1 Mar 2013 12:36:12 +0000 (14:36 +0200)]
Gem updated: devise, grape, sidekiq, settingslogic
Sato Hiroyuki [Fri, 1 Mar 2013 08:28:29 +0000 (17:28 +0900)]
Fix spinach errors.
Dmitriy Zaporozhets [Fri, 1 Mar 2013 07:46:07 +0000 (23:46 -0800)]
Merge pull request #3082 from devote/patch-1
Distorted lines in `diff`
Dmitriy Zaporozhets [Fri, 1 Mar 2013 07:23:18 +0000 (09:23 +0200)]
use grit_ext 0.6.2
Dmitriy Zaporozhets [Thu, 28 Feb 2013 19:14:00 +0000 (21:14 +0200)]
update stamp
Dmitriy Zaporozhets [Thu, 28 Feb 2013 19:11:12 +0000 (21:11 +0200)]
update httparty
Dmitriy Zaporozhets [Thu, 28 Feb 2013 19:06:16 +0000 (21:06 +0200)]
update devise gem
Dmitriy Zaporozhets [Thu, 28 Feb 2013 19:02:41 +0000 (21:02 +0200)]
try to use stable version for database cleaner
Dmitriy Zaporozhets [Thu, 28 Feb 2013 17:56:16 +0000 (19:56 +0200)]
fix admin users tests
Dmitriy Zaporozhets [Thu, 28 Feb 2013 17:48:34 +0000 (09:48 -0800)]
Merge pull request #3114 from Un1matr1x/docs
docs improvement
Un1matr1x [Thu, 28 Feb 2013 17:30:07 +0000 (18:30 +0100)]
docs improvement
Dmitriy Zaporozhets [Thu, 28 Feb 2013 17:29:21 +0000 (19:29 +0200)]
allow any attachment filenames
Dmitriy Zaporozhets [Thu, 28 Feb 2013 15:46:28 +0000 (17:46 +0200)]
created-by-me filter for issues inside project. Fixed global project.issues order
Dmitriy Zaporozhets [Thu, 28 Feb 2013 15:10:06 +0000 (17:10 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Feb 2013 15:08:58 +0000 (17:08 +0200)]
Merge branch 'Undev-link-to-issue-tracker'
Dmitriy Zaporozhets [Thu, 28 Feb 2013 15:02:20 +0000 (17:02 +0200)]
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
Conflicts:
Gemfile.lock
Andrew8xx8 [Thu, 28 Feb 2013 14:55:35 +0000 (18:55 +0400)]
Fixed notes from randx
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:45:16 +0000 (06:45 -0800)]
Merge pull request #2249 from jouve/fix_possible_spec_failure
fix one of the possible causes of build failures
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:43:15 +0000 (16:43 +0200)]
Merge branch 'features/text_mail_templates'
Thomas Berger [Fri, 11 Jan 2013 16:53:30 +0000 (17:53 +0100)]
added text-templates for mail notification
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:36:11 +0000 (06:36 -0800)]
Merge pull request #3103 from ezkl/binding-of-caller-bump
Update binding_of_caller to v0.7.1
Andrew8xx8 [Thu, 28 Feb 2013 14:35:27 +0000 (18:35 +0400)]
Css classes improved
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:21:58 +0000 (16:21 +0200)]
add description what is gitlab-shell
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:13:24 +0000 (16:13 +0200)]
Add instruction to edit gitlab-shell config
Andrew8xx8 [Tue, 19 Feb 2013 19:02:25 +0000 (23:02 +0400)]
Missing descriptions added
Andrew8xx8 [Tue, 19 Feb 2013 19:01:57 +0000 (23:01 +0400)]
Tests for team and group descriptions added
Andrew8xx8 [Thu, 14 Feb 2013 08:14:34 +0000 (12:14 +0400)]
Desctiptions removed from dashboard
Andrew8xx8 [Fri, 8 Feb 2013 11:42:14 +0000 (15:42 +0400)]
Table description indentation fixed
Andrew8xx8 [Fri, 8 Feb 2013 08:16:08 +0000 (12:16 +0400)]
Description added to user temas factory
Andrew8xx8 [Thu, 7 Feb 2013 13:11:31 +0000 (17:11 +0400)]
Spinach tests fixed
Andrew8xx8 [Thu, 7 Feb 2013 11:10:14 +0000 (15:10 +0400)]
Description added to temas
Andrew8xx8 [Thu, 7 Feb 2013 10:42:52 +0000 (14:42 +0400)]
Description to groups added
Andrew8xx8 [Thu, 28 Feb 2013 12:30:47 +0000 (16:30 +0400)]
DB schema updated
Andrew8xx8 [Tue, 19 Feb 2013 13:31:45 +0000 (17:31 +0400)]
Show Issues tracker select only if one or more remote issue trackers available
Andrew8xx8 [Tue, 19 Feb 2013 13:21:59 +0000 (17:21 +0400)]
Issue helper tests improved
Andrew8xx8 [Tue, 19 Feb 2013 13:06:40 +0000 (17:06 +0400)]
Issues link from project page follows on remote bug tracker if it selected now
Andrew8xx8 [Tue, 19 Feb 2013 12:43:24 +0000 (16:43 +0400)]
Issues tracker settings enableds/disableds without page reloading now
Andrew8xx8 [Tue, 19 Feb 2013 12:37:43 +0000 (16:37 +0400)]
Default issue tracker name added to gon variables
Andrew8xx8 [Tue, 19 Feb 2013 12:30:37 +0000 (16:30 +0400)]
Gem gon added. It produces server-side variable values in javascript
Andrew8xx8 [Thu, 14 Feb 2013 14:43:06 +0000 (18:43 +0400)]
Section name returned back to base
Andrew8xx8 [Thu, 14 Feb 2013 14:26:50 +0000 (18:26 +0400)]
Default value for issues_tracker setting added
Andrew8xx8 [Thu, 14 Feb 2013 14:25:56 +0000 (18:25 +0400)]
Wrong default section in config. Fixed.
Andrew8xx8 [Tue, 12 Feb 2013 11:37:33 +0000 (15:37 +0400)]
Issues helper included to markdown helper
Andrew8xx8 [Mon, 11 Feb 2013 13:32:29 +0000 (17:32 +0400)]
Issues helper improved
Andrew8xx8 [Mon, 11 Feb 2013 14:21:04 +0000 (18:21 +0400)]
Migration added
Andrew8xx8 [Mon, 11 Feb 2013 14:17:43 +0000 (18:17 +0400)]
New field added
Andrew8xx8 [Mon, 11 Feb 2013 13:15:10 +0000 (17:15 +0400)]
External issue tracker params added to config
Andrew8xx8 [Mon, 11 Feb 2013 11:41:12 +0000 (15:41 +0400)]
Project issue tracker functions refactored
Andrew8xx8 [Fri, 8 Feb 2013 13:55:02 +0000 (17:55 +0400)]
Issue tracker added to edit project form in admin area