OSDN Git Service

wvm/gitlab.git
11 years agorequire gitlab-shell v1.4.0
Dmitriy Zaporozhets [Tue, 30 Apr 2013 11:49:35 +0000 (14:49 +0300)]
require gitlab-shell v1.4.0

11 years agoMerge pull request #3692 from szechyjs/master
Dmitriy Zaporozhets [Tue, 30 Apr 2013 11:01:56 +0000 (04:01 -0700)]
Merge pull request #3692 from szechyjs/master

Add monokai highlighting theme

11 years agoUpdate changelog
Dmitriy Zaporozhets [Tue, 30 Apr 2013 10:28:45 +0000 (13:28 +0300)]
Update changelog

11 years agoMerge pull request #3758 from fredowski/master
Dmitriy Zaporozhets [Tue, 30 Apr 2013 10:10:09 +0000 (03:10 -0700)]
Merge pull request #3758 from fredowski/master

Authenticate LDAP users in the grack module - fixed problems - tested code

11 years agoMerge pull request #3652 from brodock/beautifull-diff
Dmitriy Zaporozhets [Tue, 30 Apr 2013 08:50:15 +0000 (01:50 -0700)]
Merge pull request #3652 from brodock/beautifull-diff

Diff with better colors and some spacing on the corners

11 years agoMerge pull request #3688 from amacarthur/rake-fix
Dmitriy Zaporozhets [Tue, 30 Apr 2013 08:47:53 +0000 (01:47 -0700)]
Merge pull request #3688 from amacarthur/rake-fix

fixed broken gitlab version determination during backup

11 years agoMerge pull request #3784 from senny/upgrade_guide_cleanup
Dmitriy Zaporozhets [Tue, 30 Apr 2013 08:00:36 +0000 (01:00 -0700)]
Merge pull request #3784 from senny/upgrade_guide_cleanup

Upgrade guide cleanup

11 years agoadd missing title to upgrade guide
Yves Senn [Tue, 30 Apr 2013 07:52:25 +0000 (09:52 +0200)]
add missing title to upgrade guide

11 years agolink directly to the folder with upgrade guides
Yves Senn [Tue, 30 Apr 2013 07:51:48 +0000 (09:51 +0200)]
link directly to the folder with upgrade guides

11 years agoMerge pull request #3783 from senny/move_update_instructions_to_repo
Dmitriy Zaporozhets [Tue, 30 Apr 2013 07:32:11 +0000 (00:32 -0700)]
Merge pull request #3783 from senny/move_update_instructions_to_repo

move the update guides from the wiki into the repo

11 years agomove the update guides from the wiki into the repo
Yves Senn [Tue, 30 Apr 2013 07:29:30 +0000 (09:29 +0200)]
move the update guides from the wiki into the repo

11 years agoLDAP authentication in grack - check ldap conf before call / added comment
Friedrich Beckmann [Mon, 29 Apr 2013 20:26:03 +0000 (22:26 +0200)]
LDAP authentication in grack - check ldap conf before call / added comment

11 years agoMerge pull request #3771 from senny/move-4-2-to-5-0-from-wiki-to-repo
Dmitriy Zaporozhets [Mon, 29 Apr 2013 13:21:02 +0000 (06:21 -0700)]
Merge pull request #3771 from senny/move-4-2-to-5-0-from-wiki-to-repo

move the update instructions for 4.2 to 5.0 from the Wiki into the Repo

11 years agomove the update instructions for 4.2 to 5.0 from the Wiki into the Repo.
Yves Senn [Mon, 29 Apr 2013 12:52:06 +0000 (14:52 +0200)]
move the update instructions for 4.2 to 5.0 from the Wiki into the Repo.

11 years agoMake turbolinks loading more user-friendly
Dmitriy Zaporozhets [Mon, 29 Apr 2013 11:36:40 +0000 (14:36 +0300)]
Make turbolinks loading more user-friendly

11 years agoRemove unused code pt.2
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:54:12 +0000 (13:54 +0300)]
Remove unused code pt.2

11 years agoRemove unused code
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:50:23 +0000 (13:50 +0300)]
Remove unused code

11 years agoFix loading commit history for tree view
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:18:08 +0000 (13:18 +0300)]
Fix loading commit history for tree view

11 years agoRemove tree history & ajax slider
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:14:55 +0000 (13:14 +0300)]
Remove tree history & ajax slider

11 years agoMerge pull request #3766 from axilleas/docs
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:42:22 +0000 (02:42 -0700)]
Merge pull request #3766 from axilleas/docs

Instructions update: install postfix separately, new privilege to mysql users, sockets dir. Fixes #3639

11 years agoMerge pull request #3765 from axilleas/typo
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:38:59 +0000 (02:38 -0700)]
Merge pull request #3765 from axilleas/typo

Fixed typo in app/views/deploy_keys/index.html.haml

11 years agoMerge branch 'feature/turbolinks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:27:38 +0000 (09:27 +0000)]
Merge branch 'feature/turbolinks' of /home/git/repositories/gitlab/gitlabhq

11 years agoAdd turbolinks to application
Dmitriy Zaporozhets [Mon, 29 Apr 2013 07:10:45 +0000 (10:10 +0300)]
Add turbolinks to application

11 years agofix wrong class name
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:49:25 +0000 (09:49 +0300)]
fix wrong class name

11 years agoRefactor post-receive worker
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:43:18 +0000 (09:43 +0300)]
Refactor post-receive worker

11 years agoProvide a path to repo archive. gitlab_git up to 1.0.5
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:15:18 +0000 (09:15 +0300)]
Provide a path to repo archive. gitlab_git up to 1.0.5

11 years agogitlab_git up to 1.0.4
Dmitriy Zaporozhets [Sun, 28 Apr 2013 20:10:10 +0000 (23:10 +0300)]
gitlab_git up to 1.0.4

11 years agoCache repo size inside repo model
Dmitriy Zaporozhets [Sun, 28 Apr 2013 20:04:56 +0000 (23:04 +0300)]
Cache repo size inside repo model

11 years agoMerge branch 'feature/move_gitlab_git' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:52:51 +0000 (18:52 +0000)]
Merge branch 'feature/move_gitlab_git' of /home/git/repositories/gitlab/gitlabhq

11 years agoUpdate gitlab_git to 1.0.3
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:27:49 +0000 (21:27 +0300)]
Update gitlab_git to 1.0.3

11 years agoUse gitlab_git gem
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:03:27 +0000 (21:03 +0300)]
Use gitlab_git gem

11 years agoVersion up to 5.2.0.pre
Dmitriy Zaporozhets [Sun, 28 Apr 2013 17:56:42 +0000 (20:56 +0300)]
Version up to 5.2.0.pre

11 years agoInstall postfix separately, new update instructions. Fixes #3639
Axilleas Pipinellis [Sun, 28 Apr 2013 16:11:40 +0000 (19:11 +0300)]
Install postfix separately, new update instructions. Fixes #3639

11 years agoRemoved extra "for"
Axilleas Pipinellis [Sun, 28 Apr 2013 15:42:11 +0000 (18:42 +0300)]
Removed extra "for"

11 years agoLDAP Authentification with grack for https push - fixed password check
Friedrich Beckmann [Sat, 27 Apr 2013 20:20:26 +0000 (22:20 +0200)]
LDAP Authentification with grack for https push - fixed password check

11 years agouse github version instead of local one
Dmitriy Zaporozhets [Sat, 27 Apr 2013 21:04:03 +0000 (00:04 +0300)]
use github version instead of local one

11 years agoMove Gitlab::Git out of gitlab core
Dmitriy Zaporozhets [Sat, 27 Apr 2013 20:50:17 +0000 (23:50 +0300)]
Move Gitlab::Git out of gitlab core

11 years agoRemove ambiguous condition
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:19:56 +0000 (22:19 +0300)]
Remove ambiguous condition

11 years agoAdd link to quickly add new team member from project panel
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:19:12 +0000 (22:19 +0300)]
Add link to quickly add new team member from project panel

11 years agoRestyle clone panel on project show page
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:12:43 +0000 (22:12 +0300)]
Restyle clone panel on project show page

11 years agoShow project access level right to clone panel
Dmitriy Zaporozhets [Fri, 26 Apr 2013 17:59:29 +0000 (20:59 +0300)]
Show project access level right to clone panel

11 years agoMerge pull request #3749 from greg0ire/update-docs
Dmitriy Zaporozhets [Fri, 26 Apr 2013 17:20:04 +0000 (10:20 -0700)]
Merge pull request #3749 from greg0ire/update-docs

Handle several RDBMS

11 years agoRespect feature settings submitted via api
Dmitriy Zaporozhets [Fri, 26 Apr 2013 13:25:46 +0000 (16:25 +0300)]
Respect feature settings submitted via api

11 years agoMerge branch 'requirements-after-puma' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 26 Apr 2013 13:11:49 +0000 (13:11 +0000)]
Merge branch 'requirements-after-puma' of /home/git/repositories/gitlab/gitlabhq

11 years agoUpdate memory requirements after puma.
Sytse Sijbrandij [Fri, 26 Apr 2013 12:49:50 +0000 (14:49 +0200)]
Update memory requirements after puma.

11 years agoHandle several RDBMS
Grégoire Paris [Fri, 26 Apr 2013 09:25:04 +0000 (12:25 +0300)]
Handle several RDBMS

11 years agoChange text_field to :login from :email in line with 9d92433a7c83432657faf4c02839bba1...
David Greaves [Mon, 1 Apr 2013 16:51:05 +0000 (17:51 +0100)]
Change text_field to :login from :email in line with 9d92433a7c83432657faf4c02839bba1ba6f22ac to allow login as admin or non-ldap user when ldap is enabled
Also change haml style in line with that commit

11 years agoMerge pull request #3707 from Undev/default_project_settings
Dmitriy Zaporozhets [Fri, 26 Apr 2013 08:19:48 +0000 (01:19 -0700)]
Merge pull request #3707 from Undev/default_project_settings

Default settings for project features

11 years agoWall and snippets were disabled by default
Andrew8xx8 [Fri, 26 Apr 2013 08:02:00 +0000 (12:02 +0400)]
Wall and snippets were disabled by default

11 years agoNo unicorn config. Use higher version of gitlab-she;;
Dmitriy Zaporozhets [Fri, 26 Apr 2013 08:01:52 +0000 (11:01 +0300)]
No unicorn config. Use higher version of gitlab-she;;

11 years agoMerge pull request #3731 from coldfrontlabs/master
Dmitriy Zaporozhets [Fri, 26 Apr 2013 07:07:48 +0000 (00:07 -0700)]
Merge pull request #3731 from coldfrontlabs/master

Fix typo in Project API documentation for deleting hooks

11 years agoMerge pull request #3741 from hiroponz/improve-performance-of-network-graph
Dmitriy Zaporozhets [Fri, 26 Apr 2013 07:05:39 +0000 (00:05 -0700)]
Merge pull request #3741 from hiroponz/improve-performance-of-network-graph

Improve performance of network graph

11 years agoDraging network graph is replaced by vertical scrolling.
Sato Hiroyuki [Thu, 25 Apr 2013 22:10:09 +0000 (22:10 +0000)]
Draging network graph is replaced by vertical scrolling.

11 years agoMerge giggsey:patch-1 into improve-performance-of-network-graph
Sato Hiroyuki [Thu, 25 Apr 2013 22:02:57 +0000 (22:02 +0000)]
Merge giggsey:patch-1 into improve-performance-of-network-graph

11 years agoFix Gitlab::Git::Repository#commit returns wrong commit, if commit_id is "tag name".
Sato Hiroyuki [Thu, 25 Apr 2013 19:58:25 +0000 (19:58 +0000)]
Fix Gitlab::Git::Repository#commit returns wrong commit, if commit_id is "tag name".

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 agoFixed typo in project hook documentation
Mathew Winstone [Thu, 25 Apr 2013 12:47:04 +0000 (08:47 -0400)]
Fixed typo in project hook documentation

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

11 years agoAllow vertical scrolling on Network graph
Joshua Gigg [Wed, 24 Apr 2013 15:33:27 +0000 (17:33 +0200)]
Allow vertical scrolling on Network graph

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

11 years agoDefault values for project features added to create context
Andrew8xx8 [Wed, 24 Apr 2013 11:49:29 +0000 (15:49 +0400)]
Default values for project features added to create context

11 years agoNew settings added to enable or disable project features by default
Andrew8xx8 [Wed, 24 Apr 2013 10:12:56 +0000 (14:12 +0400)]
New settings added to enable or disable project features by default

Conflicts:
config/gitlab.yml.example
config/initializers/1_settings.rb

11 years agoAdd monokai highlighting theme
Jared Szechy [Tue, 23 Apr 2013 20:30:50 +0000 (16:30 -0400)]
Add monokai highlighting theme

11 years agofixed broken gitlab version determination during backup
Angus MacArthur [Tue, 23 Apr 2013 19:30:32 +0000 (15:30 -0400)]
fixed broken gitlab version determination during backup

If the backup directory is not sub the gitlab install directory,
then the git rev-parse call will fail.

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 agoDiff with better colors and some spacing on the corners
Gabriel Mazetto [Sun, 21 Apr 2013 08:20:56 +0000 (05:20 -0300)]
Diff with better colors and some spacing on the corners

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