OSDN Git Service
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, 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
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
Dmitriy Zaporozhets [Fri, 3 May 2013 06:41:07 +0000 (23:41 -0700)]
Merge pull request #3597 from amacarthur/fork-pull-request
updated fork feature to use gitlab-shell for v5 of gitlab
Saito [Fri, 3 May 2013 05:13:43 +0000 (22:13 -0700)]
Merge pull request #3634 from tsl0922/patch-grack-auth
fix http push 401 and 500 with some git clients
tsl0922 [Fri, 3 May 2013 03:31:23 +0000 (11:31 +0800)]
better fix for encoding error
tsl0922 [Sat, 20 Apr 2013 01:18:37 +0000 (09:18 +0800)]
fix: UTF-8 encoding error
tsl0922 [Fri, 19 Apr 2013 08:43:54 +0000 (16:43 +0800)]
fix http push 401
Angus MacArthur [Thu, 2 May 2013 20:27:40 +0000 (16:27 -0400)]
Made fixes suggested by @randx in pull request
See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-
4014638
Angus MacArthur [Thu, 2 May 2013 19:30:13 +0000 (15:30 -0400)]
Fix bug for repeated fork requests
When asking to fork a project and a project with the same name
already exists (likely from a previous fork), the recovery from
the fork failure would inadvertantly delete the repo of the
existing destination project.
Stephen Lottermoser [Thu, 2 May 2013 20:25:31 +0000 (13:25 -0700)]
Non-logged in users see public project names as static text
In the public area, project names are shown as static text for
non-logged in users, while logged-in users are given project
names as links they can follow to the project's page.
Dmitriy Zaporozhets [Thu, 2 May 2013 12:51:33 +0000 (05:51 -0700)]
Merge pull request #3645 from lucasuyezu/alphabetically_sorted
Assignees are now sorted alphabetically.
Dmitriy Zaporozhets [Thu, 2 May 2013 12:35:26 +0000 (05:35 -0700)]
Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root
[BUGFIX] User suggest at team_members/new not working with relative_url_root
Dmitriy Zaporozhets [Thu, 2 May 2013 12:28:07 +0000 (15:28 +0300)]
Fix issue with undefined dispather page
Dmitriy Zaporozhets [Thu, 2 May 2013 11:51:47 +0000 (14:51 +0300)]
Move search autocomplete call to dispatcher
Dmitriy Zaporozhets [Thu, 2 May 2013 11:36:53 +0000 (14:36 +0300)]
coffescript refactoring pt.1
Dmitriy Zaporozhets [Thu, 2 May 2013 10:23:50 +0000 (13:23 +0300)]
Fix newlines in how-to-merge. Added steps description. Fixes #3772
Dmitriy Zaporozhets [Thu, 2 May 2013 08:46:45 +0000 (11:46 +0300)]
move more inline js to handle via dispatcher
Dmitriy Zaporozhets [Thu, 2 May 2013 08:23:58 +0000 (11:23 +0300)]
Remove on-ready for NoteList event
Dmitriy Zaporozhets [Thu, 2 May 2013 08:18:29 +0000 (11:18 +0300)]
Replace inline document.ready with dispatcher
Stephen Lottermoser [Thu, 2 May 2013 07:53:54 +0000 (00:53 -0700)]
Fix internally public projects tests
Takes into account
98bea4b1ff and
3b88636d3c.
Stephen Lottermoser [Thu, 2 May 2013 06:52:05 +0000 (23:52 -0700)]
Internally public projects
Public projects listed in the public section will be linked to the
actual project's page. Public projects now give any user Guest
permissions to the project, allowing them to download the code, read
and create issues, and view anything else in the project's pages.
Ample access tests have been added to the project_access_spec to
verify correct permissions and behavior on public projects.
- Visitors to the site who are not logged in still cannot view the
project's pages.
- Logged-in users visiting a public project where they are not a team
member can create issues, but not snippets. They can view the projects
code, issues, merge requests, etc, just as if they were a Guest member
of the project.
- Since this is a public project, the user is also granted :download_code
permissions, a permission normally reserved for Reporters, since they
can clone the repo anyways and browse commits and branches locally.
Dmitriy Zaporozhets [Thu, 2 May 2013 05:46:27 +0000 (08:46 +0300)]
fix test
Dmitriy Zaporozhets [Thu, 2 May 2013 05:46:39 +0000 (22:46 -0700)]
Merge pull request #3799 from ciarand/team-admin-placeholder-text
Swapped out placeholder text on teams admin page
Ciaran Downey [Wed, 1 May 2013 22:09:18 +0000 (15:09 -0700)]
Swapped out placeholder text on teams admin page
Changed "simple Teams description" placeholder subtitle to "allow you
to organize groups of people that have a common focus. Use teams to
simplify the process of assigning roles to groups of people."
Dmitriy Zaporozhets [Wed, 1 May 2013 10:39:37 +0000 (13:39 +0300)]
gitlab_git to 1.0.6, return submodule rendering in tree
Dmitriy Zaporozhets [Wed, 1 May 2013 10:29:29 +0000 (13:29 +0300)]
Update all gems!
Dmitriy Zaporozhets [Wed, 1 May 2013 09:41:37 +0000 (12:41 +0300)]
Init aws support for file storage
Dmitriy Zaporozhets [Wed, 1 May 2013 09:02:59 +0000 (09:02 +0000)]
Merge branch 'install-link' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 1 May 2013 07:26:40 +0000 (09:26 +0200)]
Link to install guide must point to latest release automatically,
Dmitriy Zaporozhets [Tue, 30 Apr 2013 15:21:21 +0000 (08:21 -0700)]
Merge pull request #3786 from sashkab/emoji-fix
Show emoji popup if colon preceding by space or is new line.
Aleks Bunin [Tue, 30 Apr 2013 13:29:43 +0000 (09:29 -0400)]
Show emoji popup if : preceeding by space or is new line.
Dmitriy Zaporozhets [Tue, 30 Apr 2013 11:49:35 +0000 (14:49 +0300)]
require gitlab-shell v1.4.0
Dmitriy Zaporozhets [Tue, 30 Apr 2013 11:01:56 +0000 (04:01 -0700)]
Merge pull request #3692 from szechyjs/master
Add monokai highlighting theme
Dmitriy Zaporozhets [Tue, 30 Apr 2013 10:28:45 +0000 (13:28 +0300)]
Update changelog
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
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
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
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
Yves Senn [Tue, 30 Apr 2013 07:52:25 +0000 (09:52 +0200)]
add missing title to upgrade guide