OSDN Git Service

wvm/gitlab.git
11 years agoMerge pull request #3603 from axilleas/os-name
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:08:40 +0000 (03:08 -0700)]
Merge pull request #3603 from axilleas/os-name

Added os_name support for systems running systemd.

11 years agoMerge pull request #3602 from axilleas/check-redis
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:08:07 +0000 (03:08 -0700)]
Merge pull request #3602 from axilleas/check-redis

Added check_redis_version to check.rake

11 years agoMerge pull request #3604 from axilleas/config-typo
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:06:11 +0000 (03:06 -0700)]
Merge pull request #3604 from axilleas/config-typo

Fixed typo in gitlab.yml.example

11 years agoPrevent 500 error on git blame if empty file
Dmitriy Zaporozhets [Thu, 18 Apr 2013 09:46:41 +0000 (12:46 +0300)]
Prevent 500 error on git blame if empty file

11 years agoMerge branch 'feedback-forum-link' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 17 Apr 2013 20:01:27 +0000 (20:01 +0000)]
Merge branch 'feedback-forum-link' of /home/git/repositories/gitlab/gitlabhq

11 years agoFeedback forum link is cname now.
Sytse Sijbrandij [Wed, 17 Apr 2013 20:00:31 +0000 (22:00 +0200)]
Feedback forum link is cname now.

11 years agoadd gitlab shell version and updated CHANGELOG
Dmitriy Zaporozhets [Wed, 17 Apr 2013 06:49:34 +0000 (09:49 +0300)]
add gitlab shell version and updated CHANGELOG

11 years agosome usability improvements
Dmitriy Zaporozhets [Tue, 16 Apr 2013 19:20:35 +0000 (22:20 +0300)]
some usability improvements

11 years agorender tabs on milestone -> show
Dmitriy Zaporozhets [Tue, 16 Apr 2013 18:59:39 +0000 (21:59 +0300)]
render tabs on milestone -> show

11 years agoAbility to close milestone from milestones -> index
Dmitriy Zaporozhets [Tue, 16 Apr 2013 18:51:26 +0000 (21:51 +0300)]
Ability to close milestone from milestones -> index

11 years agoMerge pull request #3610 from senny/doc_no_feature_requests_in_issue_tracker
Dmitriy Zaporozhets [Tue, 16 Apr 2013 17:18:45 +0000 (10:18 -0700)]
Merge pull request #3610 from senny/doc_no_feature_requests_in_issue_tracker

contribution guidelines: no feature requests on the Github issue tracker

11 years agoRestyle milestones index
Dmitriy Zaporozhets [Tue, 16 Apr 2013 17:01:21 +0000 (20:01 +0300)]
Restyle milestones index

11 years agomigrate milestones with nil state
Dmitriy Zaporozhets [Tue, 16 Apr 2013 17:00:30 +0000 (20:00 +0300)]
migrate milestones with nil state

11 years agocontribution guidelines: no feature requests on the Github issue tracker
Yves Senn [Tue, 16 Apr 2013 16:05:05 +0000 (18:05 +0200)]
contribution guidelines: no feature requests on the Github issue tracker

State clearly that the issue tracker is not used for feature requests
and link to http://feedback.gitlab.com.

11 years agoGitlab::Git::Stats specs
Dmitriy Zaporozhets [Tue, 16 Apr 2013 13:39:48 +0000 (16:39 +0300)]
Gitlab::Git::Stats specs

11 years agoGitlab::Git::Diff specs
Dmitriy Zaporozhets [Tue, 16 Apr 2013 13:30:16 +0000 (16:30 +0300)]
Gitlab::Git::Diff specs

11 years agosymbolize keys for Gitlab::Git::Diff & Gitlab::Git::Commit
Dmitriy Zaporozhets [Tue, 16 Apr 2013 13:29:49 +0000 (16:29 +0300)]
symbolize keys for Gitlab::Git::Diff & Gitlab::Git::Commit

11 years agoFix duplicating participants in milestone
Dmitriy Zaporozhets [Tue, 16 Apr 2013 13:02:41 +0000 (16:02 +0300)]
Fix duplicating participants in milestone

11 years agoMerge branch 'feature/project_labels' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 16 Apr 2013 12:21:50 +0000 (12:21 +0000)]
Merge branch 'feature/project_labels' of /home/git/repositories/gitlab/gitlabhq

11 years agoDashboard -> projects -> filtering by project label
Dmitriy Zaporozhets [Tue, 16 Apr 2013 10:13:29 +0000 (13:13 +0300)]
Dashboard -> projects -> filtering by project label

11 years agoAdd project labels support
Dmitriy Zaporozhets [Tue, 16 Apr 2013 09:45:45 +0000 (12:45 +0300)]
Add project labels support

11 years agoPaginate users in users api
Dmitriy Zaporozhets [Tue, 16 Apr 2013 06:26:01 +0000 (09:26 +0300)]
Paginate users in users api

11 years agoMerge branch 'check-redis' of github.com:axilleas/gitlabhq into check-redis
Axilleas Pipinellis [Mon, 15 Apr 2013 18:55:15 +0000 (21:55 +0300)]
Merge branch 'check-redis' of github.com:axilleas/gitlabhq into check-redis

11 years agoAdded check_redis_version. Fixes #3449
axilleas [Sun, 14 Apr 2013 20:17:06 +0000 (23:17 +0300)]
Added check_redis_version. Fixes #3449

Checking the redis version will warn users that
are using an old version to update. Included
reference to the troubleshooting guide.

11 years agoFixed identation...
Axilleas Pipinellis [Mon, 15 Apr 2013 18:10:43 +0000 (21:10 +0300)]
Fixed identation...

11 years agoFixed redis-cli check function
Axilleas Pipinellis [Mon, 15 Apr 2013 18:02:53 +0000 (21:02 +0300)]
Fixed redis-cli check function

11 years agoAdded new output information, fixed typo
Axilleas Pipinellis [Mon, 15 Apr 2013 17:41:39 +0000 (20:41 +0300)]
Added new output information, fixed typo

11 years agoFixed typo s/insues/issues
Axilleas Pipinellis [Mon, 15 Apr 2013 16:36:00 +0000 (19:36 +0300)]
Fixed typo s/insues/issues

11 years agoWarn user about losing merge request diff
Dmitriy Zaporozhets [Mon, 15 Apr 2013 16:33:44 +0000 (19:33 +0300)]
Warn user about losing merge request diff

11 years agoFix bug when limit or offset passed as string
Dmitriy Zaporozhets [Mon, 15 Apr 2013 16:02:36 +0000 (19:02 +0300)]
Fix bug when limit or offset passed as string

11 years agoUpdate app code to use Gitlab::Git::Diff
Dmitriy Zaporozhets [Mon, 15 Apr 2013 16:02:05 +0000 (19:02 +0300)]
Update app code to use Gitlab::Git::Diff

11 years agoRemove native git calls from MR. Dump diff as array, not class
Dmitriy Zaporozhets [Mon, 15 Apr 2013 16:01:36 +0000 (19:01 +0300)]
Remove native git calls from MR. Dump diff as array, not class

11 years agoInit Gitlab::Git::Diff class
Dmitriy Zaporozhets [Mon, 15 Apr 2013 16:01:02 +0000 (19:01 +0300)]
Init Gitlab::Git::Diff class

11 years agoAdded os_name support for systems running systemd.
Axilleas Pipinellis [Mon, 15 Apr 2013 15:05:48 +0000 (18:05 +0300)]
Added os_name support for systems running systemd.

11 years agoUpdated changelog. GitLab 5.1 is beta now
Dmitriy Zaporozhets [Mon, 15 Apr 2013 13:58:10 +0000 (16:58 +0300)]
Updated changelog. GitLab 5.1 is beta now

11 years agoGit log follow support
akzhan [Mon, 15 Apr 2013 13:53:19 +0000 (16:53 +0300)]
Git log follow support

11 years agochange user_spec to pass postgres
Dmitriy Zaporozhets [Mon, 15 Apr 2013 13:29:55 +0000 (16:29 +0300)]
change user_spec to pass postgres

11 years agoAdded check_redis_version. Fixes #3449
axilleas [Sun, 14 Apr 2013 20:17:06 +0000 (23:17 +0300)]
Added check_redis_version. Fixes #3449

Checking the redis version will warn users that
are using an old version to update. Included
reference to the troubleshooting guide.

11 years agoMerge branch 'more-words' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Apr 2013 20:33:01 +0000 (20:33 +0000)]
Merge branch 'more-words' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge branch 'wording-of-notification-setting' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Apr 2013 20:31:42 +0000 (20:31 +0000)]
Merge branch 'wording-of-notification-setting' of /home/git/repositories/gitlab/gitlabhq

11 years agoShould be singular.
Sytse Sijbrandij [Fri, 12 Apr 2013 15:46:11 +0000 (17:46 +0200)]
Should be singular.

11 years agoImproving grammar. Hat tip Jan Mauritz Faber.
Sytse Sijbrandij [Fri, 12 Apr 2013 15:17:29 +0000 (17:17 +0200)]
Improving grammar. Hat tip Jan Mauritz Faber.

11 years agoMerge branch 'move-issue-above-pr' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Apr 2013 09:35:17 +0000 (09:35 +0000)]
Merge branch 'move-issue-above-pr' of /home/git/repositories/gitlab/gitlabhq

11 years agoMove issues first since people submitting PR's are more into the OpenSource thinking...
Sytse Sijbrandij [Fri, 12 Apr 2013 09:25:25 +0000 (11:25 +0200)]
Move issues first since people submitting PR's are more into the OpenSource thinking. Hat tip Yves Senn.

11 years agoFix random failing test
Dmitriy Zaporozhets [Fri, 12 Apr 2013 06:56:10 +0000 (09:56 +0300)]
Fix random failing test

11 years agoDisable mailer for spinach
Dmitriy Zaporozhets [Thu, 11 Apr 2013 20:54:20 +0000 (23:54 +0300)]
Disable mailer for spinach

11 years agoadopt tests to pass with new poltergeist
Dmitriy Zaporozhets [Thu, 11 Apr 2013 09:54:26 +0000 (12:54 +0300)]
adopt tests to pass with new poltergeist

11 years agodisable mailer for Spinach
Dmitriy Zaporozhets [Thu, 11 Apr 2013 08:50:58 +0000 (11:50 +0300)]
disable mailer for Spinach

11 years agodisable capybra 2.1 ingore hidden elements
Dmitriy Zaporozhets [Thu, 11 Apr 2013 08:25:11 +0000 (11:25 +0300)]
disable capybra 2.1 ingore hidden elements

11 years agoUpdated gems. Replaced gollum with gollum-lib
Dmitriy Zaporozhets [Thu, 11 Apr 2013 08:03:57 +0000 (11:03 +0300)]
Updated gems. Replaced gollum with gollum-lib

11 years agoUpdate capybara to 2.1, poltergeist to master
Dmitriy Zaporozhets [Thu, 11 Apr 2013 07:45:18 +0000 (10:45 +0300)]
Update capybara to 2.1, poltergeist to master

11 years agoremove yaml_db gem, Replace team members index route with team_index
Dmitriy Zaporozhets [Thu, 11 Apr 2013 06:39:49 +0000 (09:39 +0300)]
remove yaml_db gem, Replace team members index route with team_index

11 years agoFixing specs & spinach since Wiki model does not exists any more
Dmitriy Zaporozhets [Wed, 10 Apr 2013 20:48:40 +0000 (23:48 +0300)]
Fixing specs & spinach since Wiki model does not exists any more

11 years agoSpecs refactoring to reduce test time. Disabled observers by default for specs
Dmitriy Zaporozhets [Wed, 10 Apr 2013 20:28:42 +0000 (23:28 +0300)]
Specs refactoring to reduce test time. Disabled observers by default for specs

11 years agoRemove Wiki and db table since we use gollum now
Dmitriy Zaporozhets [Wed, 10 Apr 2013 19:20:00 +0000 (22:20 +0300)]
Remove Wiki and db table since we use gollum now

11 years agoRemove wiki migrator. We dont need it any more. Users should migrate to 5.0 first
Dmitriy Zaporozhets [Wed, 10 Apr 2013 17:48:21 +0000 (20:48 +0300)]
Remove wiki migrator. We dont need it any more. Users should migrate to 5.0 first

11 years agoReduce notes_on_merge_requests_spec time from 3 min to 1min
Dmitriy Zaporozhets [Wed, 10 Apr 2013 17:27:43 +0000 (20:27 +0300)]
Reduce notes_on_merge_requests_spec time from 3 min to 1min

11 years agoCleanup gfm tests
Dmitriy Zaporozhets [Wed, 10 Apr 2013 17:00:56 +0000 (20:00 +0300)]
Cleanup gfm tests

11 years agoMerge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name
Dmitriy Zaporozhets [Wed, 10 Apr 2013 16:14:26 +0000 (09:14 -0700)]
Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name

Fix overlapping test case names.

11 years agoFixed random failing test
Dmitriy Zaporozhets [Wed, 10 Apr 2013 15:26:25 +0000 (18:26 +0300)]
Fixed random failing test

11 years agobackup/restore uploads
Dmitriy Zaporozhets [Wed, 10 Apr 2013 12:41:47 +0000 (15:41 +0300)]
backup/restore uploads

11 years agoRun rewrite-hooks after repos restore
Dmitriy Zaporozhets [Wed, 10 Apr 2013 12:11:45 +0000 (15:11 +0300)]
Run rewrite-hooks after repos restore

11 years agoUse update_column to set :last_activity_at for project
Dmitriy Zaporozhets [Wed, 10 Apr 2013 11:38:04 +0000 (14:38 +0300)]
Use update_column to set :last_activity_at for project

11 years agofix gollum git instructions. related to #3562
Dmitriy Zaporozhets [Wed, 10 Apr 2013 11:35:44 +0000 (14:35 +0300)]
fix gollum git instructions. related to #3562

11 years agoMerge pull request #3557 from rgbkrk/grammar-showdown
Dmitriy Zaporozhets [Wed, 10 Apr 2013 09:01:39 +0000 (02:01 -0700)]
Merge pull request #3557 from rgbkrk/grammar-showdown

s/was/were/ for plural subjects

11 years agoMerge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 10 Apr 2013 08:53:14 +0000 (08:53 +0000)]
Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq

11 years agoHat tip to Jan Mauritz Faber for his suggestions.
Sytse Sijbrandij [Wed, 10 Apr 2013 07:19:08 +0000 (09:19 +0200)]
Hat tip to Jan Mauritz Faber for his suggestions.

11 years agos/was/were/ for plural subjects
Kyle Kelley [Wed, 10 Apr 2013 02:43:02 +0000 (22:43 -0400)]
s/was/were/ for plural subjects

11 years agoUpdate sidekiq gem. Make event body color a bit lighter
Dmitriy Zaporozhets [Tue, 9 Apr 2013 18:14:47 +0000 (21:14 +0300)]
Update sidekiq gem. Make event body color a bit lighter

11 years agoMerge branch 'Undev-feature/refactoring_scopes_pr'
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:58:58 +0000 (20:58 +0300)]
Merge branch 'Undev-feature/refactoring_scopes_pr'

11 years agoImprove migration AddLastActivityColumnIntoProject to use real last activity date...
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:58:47 +0000 (20:58 +0300)]
Improve migration AddLastActivityColumnIntoProject to use real last activity date if present

11 years agoImprove perfomance by using project.last_activity_at in project_last_activity helper
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:53:27 +0000 (20:53 +0300)]
Improve perfomance by using project.last_activity_at in project_last_activity helper

11 years agoMerge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq...
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:37:04 +0000 (20:37 +0300)]
Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr

Conflicts:
db/schema.rb

11 years agoInclude ruby 2.0 in travis
Dmitriy Zaporozhets [Tue, 9 Apr 2013 16:29:45 +0000 (19:29 +0300)]
Include ruby 2.0 in travis

11 years agoOverride Issue opened scope. Now reopened issues also included
Dmitriy Zaporozhets [Tue, 9 Apr 2013 12:04:31 +0000 (15:04 +0300)]
Override Issue opened scope. Now reopened issues also included

11 years agoFix missing initCheck for Issues page checkbox
Dmitriy Zaporozhets [Tue, 9 Apr 2013 08:17:24 +0000 (11:17 +0300)]
Fix missing initCheck for Issues page checkbox

11 years agoFix badge image url to ci.gitlab.org
Dmitriy Zaporozhets [Tue, 9 Apr 2013 07:14:11 +0000 (10:14 +0300)]
Fix badge image url to ci.gitlab.org

11 years agoFix overlapping test case names.
Douglas Huff [Sun, 7 Apr 2013 20:58:25 +0000 (13:58 -0700)]
Fix overlapping test case names.

11 years agoMerge pull request #3522 from dplarson/correct-install-docs
Dmitriy Zaporozhets [Sun, 7 Apr 2013 18:22:23 +0000 (11:22 -0700)]
Merge pull request #3522 from dplarson/correct-install-docs

Install gems with user `git`, not `gitlab`

11 years agoMerge pull request #3538 from AeroNotix/patch-1
Dmitriy Zaporozhets [Sun, 7 Apr 2013 18:21:02 +0000 (11:21 -0700)]
Merge pull request #3538 from AeroNotix/patch-1

Fixed JSON description of system hook

11 years agoremove outdated routing specs
Dmitriy Zaporozhets [Sun, 7 Apr 2013 18:18:48 +0000 (21:18 +0300)]
remove outdated routing specs

11 years agorefactor Issues.js. Remove unused actions. Respect filters while searching for issue
Dmitriy Zaporozhets [Sun, 7 Apr 2013 10:19:36 +0000 (13:19 +0300)]
refactor Issues.js. Remove unused actions. Respect filters while searching for issue

11 years agoFixed mr filter tests
Dmitriy Zaporozhets [Sun, 7 Apr 2013 09:32:24 +0000 (12:32 +0300)]
Fixed mr filter tests

11 years agoRefactoring & restyle pagination:
Dmitriy Zaporozhets [Sat, 6 Apr 2013 19:32:23 +0000 (22:32 +0300)]
Refactoring & restyle pagination:
- remove admin kaminari theme. Use gitlab theme everywhere
- use bootstrap styled for gitlab admin themes
- dont reload page when change issue filter

11 years agoFixed JSON description of system hook
Aaron France [Sat, 6 Apr 2013 18:25:46 +0000 (21:25 +0300)]
Fixed JSON description of system hook

Fixed JSON description of system hook to accurately describe what is actually being sent.

11 years agoNew entries in CHANGELOG
Dmitriy Zaporozhets [Sat, 6 Apr 2013 18:21:09 +0000 (21:21 +0300)]
New entries in CHANGELOG

11 years agoIncrease event title font size on dashboard activity feed
Dmitriy Zaporozhets [Sat, 6 Apr 2013 12:53:35 +0000 (15:53 +0300)]
Increase event title font size on dashboard activity feed

11 years agoapply redesigned MR list to dashboard, group etc
Dmitriy Zaporozhets [Sat, 6 Apr 2013 12:11:47 +0000 (15:11 +0300)]
apply redesigned MR list to dashboard, group etc

11 years agoRedesign issues, mr lists
Dmitriy Zaporozhets [Sat, 6 Apr 2013 12:10:24 +0000 (15:10 +0300)]
Redesign issues, mr lists

11 years agorefactor scss, refove unused classes
Dmitriy Zaporozhets [Sat, 6 Apr 2013 11:35:17 +0000 (14:35 +0300)]
refactor scss, refove unused classes

11 years agoremove draper
Dmitriy Zaporozhets [Fri, 5 Apr 2013 18:21:53 +0000 (21:21 +0300)]
remove draper

11 years agoBackup/restore wiki repos too
Dmitriy Zaporozhets [Fri, 5 Apr 2013 18:20:11 +0000 (21:20 +0300)]
Backup/restore wiki repos too

11 years agoRestyle tags page
Dmitriy Zaporozhets [Fri, 5 Apr 2013 18:03:39 +0000 (21:03 +0300)]
Restyle tags page

11 years agoseparate rake task for migration and persistent one
Dmitriy Zaporozhets [Fri, 5 Apr 2013 17:44:16 +0000 (20:44 +0300)]
separate rake task for migration and persistent one

11 years agomove old repositories dir to one with timestamp
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:48:56 +0000 (19:48 +0300)]
move old repositories dir to one with timestamp

11 years agoUse data[:commits] hash from event to render push info on dashboard
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:47:45 +0000 (19:47 +0300)]
Use data[:commits] hash from event to render push info on dashboard

11 years agoGet rid of event decorator. Use event data hash instead commit objects to increase...
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:47:12 +0000 (19:47 +0300)]
Get rid of event decorator. Use event data hash instead commit objects to increase perfomance

11 years agorefactor backup/restore
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:01:19 +0000 (19:01 +0300)]
refactor backup/restore

11 years agoPrevent same branch in MR seeds
Dmitriy Zaporozhets [Fri, 5 Apr 2013 13:19:05 +0000 (16:19 +0300)]
Prevent same branch in MR seeds

11 years agoReplace db:backup/restore with native mysq/pg solution
Dmitriy Zaporozhets [Fri, 5 Apr 2013 12:55:02 +0000 (15:55 +0300)]
Replace db:backup/restore with native mysq/pg solution