OSDN Git Service

wvm/gitlab.git
11 years agoAdd test related to a bug of network graph.
Sato Hiroyuki [Thu, 25 Apr 2013 13:05:22 +0000 (22:05 +0900)]
Add test related to a bug of network graph.

11 years agoFix minor bug about line overlap.
Sato Hiroyuki [Thu, 25 Apr 2013 12:53:30 +0000 (21:53 +0900)]
Fix minor bug about line overlap.

11 years agoRender graph partially.
Sato Hiroyuki [Wed, 24 Apr 2013 16:49:01 +0000 (16:49 +0000)]
Render graph partially.

11 years agoReducing database access.
Sato Hiroyuki [Wed, 24 Apr 2013 15:06:31 +0000 (15:06 +0000)]
Reducing database access.

11 years agoFix labels input overflow for res lower 1280 in project.edit
Dmitriy Zaporozhets [Tue, 23 Apr 2013 09:32:02 +0000 (09:32 +0000)]
Fix labels input overflow for res lower 1280 in project.edit

11 years agoMerge pull request #3656 from kosh30/master
Dmitriy Zaporozhets [Tue, 23 Apr 2013 07:52:06 +0000 (00:52 -0700)]
Merge pull request #3656 from kosh30/master

Typo fix in  app/views/commit/huge_commit.html.haml

11 years agoMerge pull request #3668 from Deradon/fix-blob-switching
Dmitriy Zaporozhets [Tue, 23 Apr 2013 07:50:03 +0000 (00:50 -0700)]
Merge pull request #3668 from Deradon/fix-blob-switching

Fix issue when switching branch when BLOB is shown

11 years agoFix issue when switching branch when BLOB is shown
Patrick Helm [Mon, 22 Apr 2013 22:28:30 +0000 (00:28 +0200)]
Fix issue when switching branch when BLOB is shown

Fix blob-switching for AJAX-Requests

Reorder

11 years agoMove init.d and nginx default recipes in core library to save efforts trying keep...
Dmitriy Zaporozhets [Mon, 22 Apr 2013 10:44:09 +0000 (12:44 +0200)]
Move init.d and nginx default recipes in core library to save efforts trying keep sync between gitlab-recipes and gitlabhq

11 years agoversion up to 5.0 v5.1.0
Dmitriy Zaporozhets [Mon, 22 Apr 2013 08:58:42 +0000 (08:58 +0000)]
version up to 5.0

11 years agoFix 500 error on edit with ui
Dmitriy Zaporozhets [Mon, 22 Apr 2013 08:48:52 +0000 (11:48 +0300)]
Fix 500 error on edit with ui

11 years agoUpdate huge_commit.html.haml
kosh30 [Sun, 21 Apr 2013 17:08:36 +0000 (20:08 +0300)]
Update huge_commit.html.haml

There is no _commit_box.html.haml in app/views/commits it's in app/views/commit

11 years agofix typo in README. Closes #3654
Yves Senn [Sun, 21 Apr 2013 14:49:23 +0000 (17:49 +0300)]
fix typo in README. Closes #3654

11 years agorequire gitlab:shell v1.3.0
Dmitriy Zaporozhets [Sat, 20 Apr 2013 12:56:13 +0000 (15:56 +0300)]
require gitlab:shell v1.3.0

11 years agoAdd support for git-archive in gitlab internal api
Dmitriy Zaporozhets [Sat, 20 Apr 2013 12:43:48 +0000 (15:43 +0300)]
Add support for git-archive in gitlab internal api

11 years ago5.1 rc1
Dmitriy Zaporozhets [Sat, 20 Apr 2013 08:41:16 +0000 (11:41 +0300)]
5.1 rc1

11 years agoMerge pull request #3625 from chr1831/master
Dmitriy Zaporozhets [Fri, 19 Apr 2013 19:56:57 +0000 (12:56 -0700)]
Merge pull request #3625 from chr1831/master

Use secure Gravatar url when https is set to true in the configuration

11 years agoRedesign team.members pages
Dmitriy Zaporozhets [Fri, 19 Apr 2013 19:37:44 +0000 (22:37 +0300)]
Redesign team.members pages

11 years agouse green bg for merged MR badge
Dmitriy Zaporozhets [Fri, 19 Apr 2013 18:57:30 +0000 (21:57 +0300)]
use green bg for merged MR badge

11 years agoShow CI status even for closed MR. Use green bg for "Merged by username" message...
Dmitriy Zaporozhets [Fri, 19 Apr 2013 18:50:37 +0000 (21:50 +0300)]
Show CI status even for closed MR. Use green bg for "Merged by username" message and red for closed one

11 years agohime last push widget if user already has MR created
Dmitriy Zaporozhets [Fri, 19 Apr 2013 18:19:16 +0000 (21:19 +0300)]
hime last push widget if user already has MR created

11 years agoIncrease usage of $primary_color variable
Dmitriy Zaporozhets [Fri, 19 Apr 2013 18:06:53 +0000 (21:06 +0300)]
Increase usage of $primary_color variable

11 years agoFix issues search overflow on low res.
Dmitriy Zaporozhets [Fri, 19 Apr 2013 15:18:40 +0000 (18:18 +0300)]
Fix issues search overflow on low res.

11 years agomove promo section in shared partial
Dmitriy Zaporozhets [Fri, 19 Apr 2013 15:09:14 +0000 (18:09 +0300)]
move promo section in shared partial

11 years agoKeep update docs inside repo so people can submit PR
Dmitriy Zaporozhets [Fri, 19 Apr 2013 14:27:30 +0000 (17:27 +0300)]
Keep update docs inside repo so people can submit PR

11 years agoremove unicorn config since we use puma now
Dmitriy Zaporozhets [Fri, 19 Apr 2013 14:22:55 +0000 (17:22 +0300)]
remove unicorn config since we use puma now

11 years agoShow last commit for tree
Dmitriy Zaporozhets [Fri, 19 Apr 2013 06:33:56 +0000 (09:33 +0300)]
Show last commit for tree

11 years agoMinor usability improvements
Dmitriy Zaporozhets [Thu, 18 Apr 2013 14:28:09 +0000 (17:28 +0300)]
Minor usability improvements

11 years agoInvoke shell setup after backup restore
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:27:52 +0000 (13:27 +0300)]
Invoke shell setup after backup restore

11 years agoMerge pull request #3209 from tsl0922/master
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:25:03 +0000 (03:25 -0700)]
Merge pull request #3209 from tsl0922/master

Fix: API 500 error when project does not exists

11 years agoMerge pull request #3315 from yujinakayama/fix-project-summary-box-overflow
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:19:29 +0000 (03:19 -0700)]
Merge pull request #3315 from yujinakayama/fix-project-summary-box-overflow

Fix overflow of text in the project summary box in Chrome and Safari

11 years agoMerge pull request #3583 from karlhungus/update_dev_setup_to_not_use_hard_coded_path_...
Dmitriy Zaporozhets [Thu, 18 Apr 2013 10:10:23 +0000 (03:10 -0700)]
Merge pull request #3583 from karlhungus/update_dev_setup_to_not_use_hard_coded_path_to_gitlab_shell

Updated setup to reference the gitlab-shell var

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 agoOverride gravatar url to use SSL if gitlab has the SSL flag set to true.
Sylas [Thu, 18 Apr 2013 04:34:08 +0000 (21:34 -0700)]
Override gravatar url to use SSL if gitlab has the SSL flag set to true.

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 agoUpdated setup to reference the gitlab-shell var
Izaak Alpert [Fri, 12 Apr 2013 19:16:08 +0000 (15:16 -0400)]
Updated setup to reference the gitlab-shell var

-Well really it uses what everything else uses -- would be nice to have this as a specific config var

Change-Id: I08cef6080950bf40360b461abd2535ea8890410d

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