OSDN Git Service
Dmitriy Zaporozhets [Mon, 13 May 2013 09:19:02 +0000 (02:19 -0700)]
Merge pull request #3921 from bbodenmiller/patch-8
update links to be relative paths and add CONTRIBUTING.md link
Dmitriy Zaporozhets [Mon, 13 May 2013 09:18:48 +0000 (02:18 -0700)]
Merge pull request #3920 from bbodenmiller/patch-7
fixed fact about memory usage
Dmitriy Zaporozhets [Mon, 13 May 2013 09:18:34 +0000 (02:18 -0700)]
Merge pull request #3912 from bbodenmiller/patch-6
fixed capitalization and added Google Analytics
Dmitriy Zaporozhets [Mon, 13 May 2013 09:13:18 +0000 (02:13 -0700)]
Merge pull request #3894 from axilleas/gitconfig-fix
Configure git global settings in installation docs
Dmitriy Zaporozhets [Mon, 13 May 2013 09:08:00 +0000 (02:08 -0700)]
Merge pull request #3918 from joeandaverde/unsanitized
System calls to gitlab-shell were using unsanitized user input
Dmitriy Zaporozhets [Mon, 13 May 2013 09:06:33 +0000 (02:06 -0700)]
Merge pull request #3911 from babatakao/migrate_note_linecode
Migrate notes.line_code format.
Dmitriy Zaporozhets [Mon, 13 May 2013 08:59:30 +0000 (11:59 +0300)]
More strict validation for SSH Key content
Ben Bodenmiller [Mon, 13 May 2013 07:48:08 +0000 (01:48 -0600)]
update links to be relative paths and add CONTRIBUTING.md link
Ben Bodenmiller [Mon, 13 May 2013 07:34:46 +0000 (01:34 -0600)]
fixed fact about memory usage
Joe Andaverde [Sun, 12 May 2013 14:10:34 +0000 (09:10 -0500)]
System calls were using unsanitized user input
Ben Bodenmiller [Sat, 11 May 2013 08:27:54 +0000 (02:27 -0600)]
fixed capitalization and added Google Analytics
baba [Sat, 11 May 2013 07:53:07 +0000 (16:53 +0900)]
Migrate notes.line_code format.
Since version 4.1, notes.line_code means:
{SHA1 hash of file path}_{old line}_{new line}
but the older version means:
{file index of the commit}_{old line}_{new line}
This rake task migrate the above differences.
Axilleas Pipinellis [Thu, 9 May 2013 12:37:39 +0000 (15:37 +0300)]
Configure git global settings
Setting Git's global user.name and user.email are missing from
instructions, causing check.rake to fail at this step.
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
Dmitriy Zaporozhets [Thu, 9 May 2013 08:46:32 +0000 (11:46 +0300)]
made some ui enhancement for search page
Dmitriy Zaporozhets [Thu, 9 May 2013 08:27:14 +0000 (11:27 +0300)]
Move files search to gitlab_git
Dmitriy Zaporozhets [Thu, 9 May 2013 08:04:05 +0000 (11:04 +0300)]
Move blob_snippet to gitlab_git gem
Dmitriy Zaporozhets [Thu, 9 May 2013 08:03:15 +0000 (11:03 +0300)]
Fix monokai highlight line css
Dmitriy Zaporozhets [Thu, 9 May 2013 08:02:48 +0000 (11:02 +0300)]
Update gitlab_git and restore travis.yml
Javier Castro [Sun, 5 May 2013 13:27:31 +0000 (10:27 -0300)]
Fix missing div container for nice css styling
Javier Castro [Sun, 14 Apr 2013 17:07:11 +0000 (14:07 -0300)]
Implemented code search feature
Dmitriy Zaporozhets [Thu, 9 May 2013 06:51:54 +0000 (23:51 -0700)]
Merge pull request #3893 from rezigned/feature/update-init.d
Update init.d script
rezigned [Thu, 9 May 2013 05:37:56 +0000 (12:37 +0700)]
Update init.d script
The original init.d script uses a fixed username (e.g. git). Which is not flexible
when we using other user. So, I've updated it to use $APP_USER variable
instead and wrap it in a function to reduce repetitive codes.
Dmitriy Zaporozhets [Wed, 8 May 2013 18:27:43 +0000 (21:27 +0300)]
Fix last tree breadcrumbs for blob
Dmitriy Zaporozhets [Wed, 8 May 2013 18:17:48 +0000 (11:17 -0700)]
Merge pull request #3687 from hiroponz/fix-not-using-git-bin-path
Fix not using git.bin_path in config.
Dmitriy Zaporozhets [Wed, 8 May 2013 18:12:42 +0000 (11:12 -0700)]
Merge pull request #3880 from hiroponz/fix-check-git-version
Add Gitlab::VersionInfo class to fix and simplify version check.
Dmitriy Zaporozhets [Wed, 8 May 2013 18:03:36 +0000 (21:03 +0300)]
Add custom sing-in text & google analytics
Dmitriy Zaporozhets [Wed, 8 May 2013 18:03:14 +0000 (21:03 +0300)]
Add extra config for some advanced customization
Dmitriy Zaporozhets [Wed, 8 May 2013 17:11:49 +0000 (20:11 +0300)]
Admin.user page: sort projects, add better confirm message for leaving team
Dmitriy Zaporozhets [Wed, 8 May 2013 17:06:12 +0000 (20:06 +0300)]
Fix project labels scope
Dmitriy Zaporozhets [Wed, 8 May 2013 16:40:31 +0000 (19:40 +0300)]
Dont show fork button in personal projects. Point to fork if already forked project
Dmitriy Zaporozhets [Wed, 8 May 2013 11:27:19 +0000 (11:27 +0000)]
Merge branch 'enhancement/issue_filter_dropdown' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 8 May 2013 11:26:42 +0000 (14:26 +0300)]
Update CHANGELOG
Dmitriy Zaporozhets [Wed, 8 May 2013 11:18:16 +0000 (04:18 -0700)]
Merge pull request #3834 from ichord/gfm-autocomp
improve gfm autocomplete
Dmitriy Zaporozhets [Wed, 8 May 2013 10:43:21 +0000 (13:43 +0300)]
bring more usability to issues filtering. Block issues area on loading filtered results
Sato Hiroyuki [Wed, 8 May 2013 05:19:51 +0000 (14:19 +0900)]
Add Gitlab::VersionInfo class to fix and simplify version check.
It returns "yes" if required version is "1.7.10" and current version is "1.6.10",
because the patch version of current version equals to that of required version.
Dmitriy Zaporozhets [Wed, 8 May 2013 07:06:48 +0000 (10:06 +0300)]
init filter links
Dmitriy Zaporozhets [Wed, 8 May 2013 07:00:19 +0000 (10:00 +0300)]
replace selectboxes with filters
Dmitriy Zaporozhets [Wed, 8 May 2013 06:18:39 +0000 (23:18 -0700)]
Merge pull request #3862 from crazyscience/patch-3
Setting the working directory before git operations
Dmitriy Zaporozhets [Wed, 8 May 2013 06:17:32 +0000 (23:17 -0700)]
Merge pull request #3877 from mikehaertl/3793-puma-relative-url
Puma configuration for relative base URL
Michael Härtl [Wed, 8 May 2013 06:09:23 +0000 (08:09 +0200)]
Fixes #3793: Puma configuration for relative base URL
Dmitriy Zaporozhets [Wed, 8 May 2013 05:52:45 +0000 (22:52 -0700)]
Merge pull request #3874 from axilleas/installation-fix
Bump charlock_holmes to 0.9.6.4
crazyscience [Tue, 7 May 2013 02:12:02 +0000 (19:12 -0700)]
Setting the working directory before git operations
Axilleas Pipinellis [Tue, 7 May 2013 19:49:54 +0000 (22:49 +0300)]
Bump charlock_holmes to 0.9.6.4
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
Dmitriy Zaporozhets [Tue, 7 May 2013 18:28:16 +0000 (21:28 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 7 May 2013 18:26:46 +0000 (18:26 +0000)]
Merge branch 'feature/labels_set' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 7 May 2013 16:46:35 +0000 (19:46 +0300)]
fix api delete hook test
Dmitriy Zaporozhets [Tue, 7 May 2013 16:26:41 +0000 (19:26 +0300)]
Include default labels in issues autocomplete etc. Show colored labels on issues show page
Dmitriy Zaporozhets [Tue, 7 May 2013 14:57:59 +0000 (17:57 +0300)]
add Gitlab::Label class and different color labels for default labels set
Dmitriy Zaporozhets [Tue, 7 May 2013 14:57:29 +0000 (17:57 +0300)]
Add generate action to labels controller which allow creation of default labels set for project
Dmitriy Zaporozhets [Tue, 7 May 2013 14:55:02 +0000 (07:55 -0700)]
Merge pull request #3871 from axilleas/backup-fix
Fix errors during backup task. Fix #3785
Dmitriy Zaporozhets [Tue, 7 May 2013 13:59:03 +0000 (06:59 -0700)]
Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes
Code cleanup: Replace old hashes and remove trailing spaces
Axilleas Pipinellis [Tue, 7 May 2013 06:14:03 +0000 (09:14 +0300)]
Fix errors during backup task. Fix #3785
By default there is no public/uploads directory when no attachments
are uploaded. Prompt users to create the uploads directory during
install otherwise the backup task will fail.
Place mysqldump args in single quotes to avoid error if password
contains special characters.
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
Dmitriy Zaporozhets [Tue, 7 May 2013 11:32:12 +0000 (04:32 -0700)]
Merge pull request #3868 from hiroponz/fix_check_git_version
Fix check git version.
Dmitriy Zaporozhets [Tue, 7 May 2013 11:31:08 +0000 (04:31 -0700)]
Merge pull request #3866 from senny/maintenance_guidelines
maintenance policy
Dmitriy Zaporozhets [Tue, 7 May 2013 11:30:48 +0000 (04:30 -0700)]
Merge pull request #3852 from axilleas/minitest-fix
Add minitest to Gemfile. Fix #3826
Yves Senn [Mon, 6 May 2013 15:08:09 +0000 (17:08 +0200)]
maintenance policy draft
Sato Hiroyuki [Tue, 23 Apr 2013 19:45:59 +0000 (04:45 +0900)]
Fix not using git.bin_path in config.
Closing #3614" and "Closing #3574.
Sato Hiroyuki [Tue, 7 May 2013 08:12:44 +0000 (17:12 +0900)]
Fix check git version.
Checking is "yes" only if git version equals "1.7.10" exactly.
Axilleas Pipinellis [Mon, 6 May 2013 16:53:19 +0000 (19:53 +0300)]
Add minitest to Gemfile. Fix #3826
There are occasions where minitest is not bundled in packaged
versions of ruby that some OSes distribute (eg Fedora). Adding
minitest to Gemfile ensures that it gets loaded and tests can run.
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
Dmitriy Zaporozhets [Mon, 6 May 2013 19:18:25 +0000 (12:18 -0700)]
Merge pull request #3856 from NARKOZ/delete-hook-api
fix API route to delete project hook
Nihad Abbasov [Mon, 6 May 2013 19:09:23 +0000 (00:09 +0500)]
fix API route to delete project hook
Dmitriy Zaporozhets [Mon, 6 May 2013 18:48:28 +0000 (21:48 +0300)]
Restyle admin -> groups page
Dmitriy Zaporozhets [Mon, 6 May 2013 17:56:45 +0000 (20:56 +0300)]
Style pagination
Dmitriy Zaporozhets [Mon, 6 May 2013 17:41:08 +0000 (20:41 +0300)]
Usability improvements to deploy leys
Dmitriy Zaporozhets [Mon, 6 May 2013 15:11:11 +0000 (08:11 -0700)]
Merge pull request #3847 from boldt/unicorn-to-puma
Fixed forgotten unicorn to puma in a comment.
Dennis Boldt [Mon, 6 May 2013 14:52:47 +0000 (16:52 +0200)]
Fixed forgotten unicorn to puma in a comment.
Dmitriy Zaporozhets [Mon, 6 May 2013 14:50:30 +0000 (17:50 +0300)]
Update CHANGELOG
Dmitriy Zaporozhets [Mon, 6 May 2013 14:43:21 +0000 (14:43 +0000)]
Merge branch 'feature/improve_deploy_keys' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 6 May 2013 14:42:13 +0000 (17:42 +0300)]
Add migration code for existing deploy keys
Dmitriy Zaporozhets [Mon, 6 May 2013 13:24:58 +0000 (16:24 +0300)]
modify api to work with new deploy keys
Dmitriy Zaporozhets [Mon, 6 May 2013 13:20:15 +0000 (06:20 -0700)]
Merge pull request #3845 from senny/link_contribution_guide_to_test_section
link contribution guide to test section in README
Yves Senn [Mon, 6 May 2013 13:17:37 +0000 (15:17 +0200)]
link contribution guide to test section in README
Dmitriy Zaporozhets [Mon, 6 May 2013 12:10:55 +0000 (15:10 +0300)]
Feature: Deploy keys between projects
Dmitriy Zaporozhets [Mon, 6 May 2013 12:10:05 +0000 (15:10 +0300)]
Remove project_id from keys table
Dmitriy Zaporozhets [Mon, 6 May 2013 12:09:41 +0000 (15:09 +0300)]
Feature tests for deploy keys
Dmitriy Zaporozhets [Mon, 6 May 2013 12:09:26 +0000 (15:09 +0300)]
Model specs for DeployKeys
Dmitriy Zaporozhets [Mon, 6 May 2013 12:08:53 +0000 (15:08 +0300)]
Check git version in gitlab:check
Dmitriy Zaporozhets [Mon, 6 May 2013 09:27:54 +0000 (12:27 +0300)]
migrations for ssh key STI and deploy keys <-> projects relation
Dmitriy Zaporozhets [Mon, 6 May 2013 09:26:36 +0000 (12:26 +0300)]
Create DeployKey & DeployKeysProject models. Bulding many to many relation between deploy keys and projects
Dmitriy Zaporozhets [Mon, 6 May 2013 06:43:12 +0000 (23:43 -0700)]
Merge pull request #3837 from majjacz/patch-1
Changed forgotten unicorn to puma in the init script
Dmitriy Zaporozhets [Mon, 6 May 2013 06:42:42 +0000 (23:42 -0700)]
Merge pull request #3841 from falk/master
Remove 2000 char limit on issue description
Andrey Kumanyaev [Wed, 20 Mar 2013 22:00:52 +0000 (02:00 +0400)]
Repair failed test
Andrey Kumanyaev [Wed, 20 Mar 2013 21:46:30 +0000 (01:46 +0400)]
remove trailing spaces
Andrey Kumanyaev [Sun, 5 May 2013 14:01:10 +0000 (18:01 +0400)]
Replace old hashes with new 1.9 ruby hashes (rebase)
falk [Sun, 5 May 2013 13:54:22 +0000 (15:54 +0200)]
Remove 2000 char limit on issue description textarea
Dmitriy Zaporozhets [Sun, 5 May 2013 09:48:32 +0000 (12:48 +0300)]
Add smtp_settings sample
majjacz [Sat, 4 May 2013 19:39:53 +0000 (21:39 +0200)]
Changed forgotten unicorn to puma in the init script
ichord [Fri, 3 May 2013 15:39:18 +0000 (23:39 +0800)]
autocomplete issues and preload autocomplete data.
update jquery-atwho-rails to v0.3.0
add autocomplete_source action to project for gfm autocomplete
move init_autocomplete layout from head_panel to project_resource
Dmitriy Zaporozhets [Fri, 3 May 2013 21:08:49 +0000 (00:08 +0300)]
Reorder buttons on clone panel of project
Dmitriy Zaporozhets [Fri, 3 May 2013 19:56:00 +0000 (12:56 -0700)]
Merge pull request #3829 from amacarthur/ruby2-fork-fix
fork failing when calling initialize_dup
Angus MacArthur [Fri, 3 May 2013 15:59:26 +0000 (11:59 -0400)]
fork failing when calling initialize_dup
initialize_dup has been made private as of ruby 2.0.0. I have
corrected it to call the publicly available dup method
Dmitriy Zaporozhets [Fri, 3 May 2013 10:55:20 +0000 (03:55 -0700)]
Merge pull request #3814 from tsl0922/fix-ace-mode-404
fix ace editor Syntax Highlighter mode load 404
Dmitriy Zaporozhets [Fri, 3 May 2013 10:53:26 +0000 (03:53 -0700)]
Merge pull request #3818 from bbodenmiller/patch-1
add proper code/command formatting where missing in CONTRIBUTING.md
Dmitriy Zaporozhets [Fri, 3 May 2013 10:51:53 +0000 (03:51 -0700)]
Merge pull request #3820 from bbodenmiller/patch-3
link to RSpec. related to #3810
Dmitriy Zaporozhets [Fri, 3 May 2013 10:51:03 +0000 (03:51 -0700)]
Merge pull request #3817 from gitlabhq/link_to_spinach_in_readm
link to spinach in the README. Closes #3810
tsl0922 [Fri, 3 May 2013 10:09:57 +0000 (18:09 +0800)]
fix ace mode 404
Ben Bodenmiller [Fri, 3 May 2013 08:03:49 +0000 (01:03 -0700)]
link to RSpec. related to #3810
Ben Bodenmiller [Fri, 3 May 2013 07:48:14 +0000 (00:48 -0700)]
add proper code/command formatting where missing
Yves Senn [Fri, 3 May 2013 07:14:44 +0000 (10:14 +0300)]
link to spinach in the README. Closes #3810
Dmitriy Zaporozhets [Fri, 3 May 2013 07:00:48 +0000 (00:00 -0700)]
Merge pull request #3801 from holdtotherod/feature/internally-public-projects
Internally public projects