OSDN Git Service
tsl0922 [Fri, 19 Apr 2013 08:43:54 +0000 (16:43 +0800)]
fix http push 401
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
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
Yves Senn [Tue, 30 Apr 2013 07:51:48 +0000 (09:51 +0200)]
link directly to the folder with upgrade guides
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
Yves Senn [Tue, 30 Apr 2013 07:29:30 +0000 (09:29 +0200)]
move the update guides from the wiki into the repo
Friedrich Beckmann [Mon, 29 Apr 2013 20:26:03 +0000 (22:26 +0200)]
LDAP authentication in grack - check ldap conf before call / added comment
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
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.
Dmitriy Zaporozhets [Mon, 29 Apr 2013 11:36:40 +0000 (14:36 +0300)]
Make turbolinks loading more user-friendly
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:54:12 +0000 (13:54 +0300)]
Remove unused code pt.2
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:50:23 +0000 (13:50 +0300)]
Remove unused code
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:18:08 +0000 (13:18 +0300)]
Fix loading commit history for tree view
Dmitriy Zaporozhets [Mon, 29 Apr 2013 10:14:55 +0000 (13:14 +0300)]
Remove tree history & ajax slider
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
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
Dmitriy Zaporozhets [Mon, 29 Apr 2013 09:27:38 +0000 (09:27 +0000)]
Merge branch 'feature/turbolinks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Apr 2013 07:10:45 +0000 (10:10 +0300)]
Add turbolinks to application
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:49:25 +0000 (09:49 +0300)]
fix wrong class name
Dmitriy Zaporozhets [Mon, 29 Apr 2013 06:43:18 +0000 (09:43 +0300)]
Refactor post-receive worker
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
Dmitriy Zaporozhets [Sun, 28 Apr 2013 20:10:10 +0000 (23:10 +0300)]
gitlab_git up to 1.0.4
Dmitriy Zaporozhets [Sun, 28 Apr 2013 20:04:56 +0000 (23:04 +0300)]
Cache repo size inside repo model
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
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:27:49 +0000 (21:27 +0300)]
Update gitlab_git to 1.0.3
Dmitriy Zaporozhets [Sun, 28 Apr 2013 18:03:27 +0000 (21:03 +0300)]
Use gitlab_git gem
Dmitriy Zaporozhets [Sun, 28 Apr 2013 17:56:42 +0000 (20:56 +0300)]
Version up to 5.2.0.pre
Axilleas Pipinellis [Sun, 28 Apr 2013 16:11:40 +0000 (19:11 +0300)]
Install postfix separately, new update instructions. Fixes #3639
Axilleas Pipinellis [Sun, 28 Apr 2013 15:42:11 +0000 (18:42 +0300)]
Removed extra "for"
Friedrich Beckmann [Sat, 27 Apr 2013 20:20:26 +0000 (22:20 +0200)]
LDAP Authentification with grack for https push - fixed password check
Dmitriy Zaporozhets [Sat, 27 Apr 2013 21:04:03 +0000 (00:04 +0300)]
use github version instead of local one
Dmitriy Zaporozhets [Sat, 27 Apr 2013 20:50:17 +0000 (23:50 +0300)]
Move Gitlab::Git out of gitlab core
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:19:56 +0000 (22:19 +0300)]
Remove ambiguous condition
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:19:12 +0000 (22:19 +0300)]
Add link to quickly add new team member from project panel
Dmitriy Zaporozhets [Fri, 26 Apr 2013 19:12:43 +0000 (22:12 +0300)]
Restyle clone panel on project show page
Dmitriy Zaporozhets [Fri, 26 Apr 2013 17:59:29 +0000 (20:59 +0300)]
Show project access level right to clone panel
Dmitriy Zaporozhets [Fri, 26 Apr 2013 17:20:04 +0000 (10:20 -0700)]
Merge pull request #3749 from greg0ire/update-docs
Handle several RDBMS
Dmitriy Zaporozhets [Fri, 26 Apr 2013 13:25:46 +0000 (16:25 +0300)]
Respect feature settings submitted via api
Dmitriy Zaporozhets [Fri, 26 Apr 2013 13:11:49 +0000 (13:11 +0000)]
Merge branch 'requirements-after-puma' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 26 Apr 2013 12:49:50 +0000 (14:49 +0200)]
Update memory requirements after puma.
Grégoire Paris [Fri, 26 Apr 2013 09:25:04 +0000 (12:25 +0300)]
Handle several RDBMS
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
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
Andrew8xx8 [Fri, 26 Apr 2013 08:02:00 +0000 (12:02 +0400)]
Wall and snippets were disabled by default
Dmitriy Zaporozhets [Fri, 26 Apr 2013 08:01:52 +0000 (11:01 +0300)]
No unicorn config. Use higher version of gitlab-she;;
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
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
Sato Hiroyuki [Thu, 25 Apr 2013 22:10:09 +0000 (22:10 +0000)]
Draging network graph is replaced by vertical scrolling.
Sato Hiroyuki [Thu, 25 Apr 2013 22:02:57 +0000 (22:02 +0000)]
Merge giggsey:patch-1 into improve-performance-of-network-graph
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".
Sato Hiroyuki [Thu, 25 Apr 2013 13:05:22 +0000 (22:05 +0900)]
Add test related to a bug of network graph.
Sato Hiroyuki [Thu, 25 Apr 2013 12:53:30 +0000 (21:53 +0900)]
Fix minor bug about line overlap.
Mathew Winstone [Thu, 25 Apr 2013 12:47:04 +0000 (08:47 -0400)]
Fixed typo in project hook documentation
Sato Hiroyuki [Wed, 24 Apr 2013 16:49:01 +0000 (16:49 +0000)]
Render graph partially.
Christian Simon [Wed, 24 Apr 2013 07:31:36 +0000 (09:31 +0200)]
[BUGFIX] User suggest at team_members/new not working with relative_url_root
* Closing #3540
* Closing #3704
Joshua Gigg [Wed, 24 Apr 2013 15:33:27 +0000 (17:33 +0200)]
Allow vertical scrolling on Network graph
Sato Hiroyuki [Wed, 24 Apr 2013 15:06:31 +0000 (15:06 +0000)]
Reducing database access.
Andrew8xx8 [Wed, 24 Apr 2013 11:49:29 +0000 (15:49 +0400)]
Default values for project features added to create context
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
Jared Szechy [Tue, 23 Apr 2013 20:30:50 +0000 (16:30 -0400)]
Add monokai highlighting theme
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.
Dmitriy Zaporozhets [Tue, 23 Apr 2013 09:32:02 +0000 (09:32 +0000)]
Fix labels input overflow for res lower 1280 in project.edit
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
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
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
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
Dmitriy Zaporozhets [Mon, 22 Apr 2013 08:58:42 +0000 (08:58 +0000)]
version up to 5.0
Dmitriy Zaporozhets [Mon, 22 Apr 2013 08:48:52 +0000 (11:48 +0300)]
Fix 500 error on edit with ui
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
Yves Senn [Sun, 21 Apr 2013 14:49:23 +0000 (17:49 +0300)]
fix typo in README. Closes #3654
Gabriel Mazetto [Sun, 21 Apr 2013 08:20:56 +0000 (05:20 -0300)]
Diff with better colors and some spacing on the corners
Dmitriy Zaporozhets [Sat, 20 Apr 2013 12:56:13 +0000 (15:56 +0300)]
require gitlab:shell v1.3.0
Dmitriy Zaporozhets [Sat, 20 Apr 2013 12:43:48 +0000 (15:43 +0300)]
Add support for git-archive in gitlab internal api
Dmitriy Zaporozhets [Sat, 20 Apr 2013 08:41:16 +0000 (11:41 +0300)]
5.1 rc1
Lucas Uyezu [Sat, 20 Apr 2013 05:06:51 +0000 (02:06 -0300)]
Assignees are now sorted alphabetically.