OSDN Git Service
Dmitriy Zaporozhets [Sat, 9 Nov 2013 07:59:27 +0000 (23:59 -0800)]
Merge pull request #5571 from bke-drewb/email
Fix minor errors/annoyances in email templates
Dmitriy Zaporozhets [Sat, 9 Nov 2013 07:59:04 +0000 (23:59 -0800)]
Merge pull request #4795 from bke-drewb/issue-4769
Issue-4769 - Unable to update case of label
Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:49:38 +0000 (18:49 +0200)]
Make sure private_token for API is a string
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:33:52 +0000 (16:33 +0000)]
Merge branch 'contribution-license-agreement' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:29:26 +0000 (18:29 +0200)]
Add specs for Email confirmation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Drew Blessing [Fri, 8 Nov 2013 15:04:36 +0000 (09:04 -0600)]
Fix minor errors/annoyances in email templates
There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates. There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)
Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:19:40 +0000 (16:19 +0000)]
Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 8 Nov 2013 16:18:55 +0000 (16:18 +0000)]
Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 8 Nov 2013 07:22:50 +0000 (09:22 +0200)]
Removed Project#discover_default_branch since it not needed any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Marin Jankovski [Thu, 7 Nov 2013 08:56:12 +0000 (09:56 +0100)]
Remove separate installation of charlock_holmes.
Dmitriy Zaporozhets [Wed, 6 Nov 2013 19:52:37 +0000 (21:52 +0200)]
Require gitlab-shell 1.7.6
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 18:24:19 +0000 (18:24 +0000)]
Merge branch 'improve/default_branch' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:43:51 +0000 (19:43 +0200)]
update CHANGELOG with default_branch changes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:38:37 +0000 (19:38 +0200)]
Fix spinach tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:14:11 +0000 (19:14 +0200)]
Remove default_branch support from API project creation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 17:13:45 +0000 (19:13 +0200)]
Replace assign with stub for default_branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 16:45:39 +0000 (18:45 +0200)]
Project#default_branch use repo HEAD instead of DB value now
Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Marin Jankovski [Wed, 6 Nov 2013 12:10:59 +0000 (13:10 +0100)]
Enable rack_attack by default.
Dmitriy Zaporozhets [Wed, 6 Nov 2013 07:58:43 +0000 (09:58 +0200)]
Refactor search views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 07:54:42 +0000 (09:54 +0200)]
Look for project description during search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 6 Nov 2013 07:32:17 +0000 (09:32 +0200)]
More entries to changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 15:16:29 +0000 (15:16 +0000)]
Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 5 Nov 2013 15:15:43 +0000 (17:15 +0200)]
Remove User#namespaces method from code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 14:58:13 +0000 (16:58 +0200)]
Refactor user associations. Drop support of Group#owner_id
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 14:41:29 +0000 (16:41 +0200)]
New feature: Ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 13:35:49 +0000 (15:35 +0200)]
Revert "More escaping"
This reverts commit
c46eaca91247ccf8e6fb3b691dad028e1b084ae3.
Dmitriy Zaporozhets [Tue, 5 Nov 2013 11:35:40 +0000 (13:35 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 5 Nov 2013 11:35:22 +0000 (11:35 +0000)]
Merge branch 'feature/create_file' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 5 Nov 2013 10:23:11 +0000 (12:23 +0200)]
Hide new file link if not branch HEAD
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 10:21:11 +0000 (12:21 +0200)]
Refactoring for EditTree and NewTree controllers and contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 10:06:52 +0000 (12:06 +0200)]
Move part of file creation logic into separate context
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 5 Nov 2013 08:45:23 +0000 (10:45 +0200)]
Feature test for New file feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Tue, 5 Nov 2013 08:30:45 +0000 (00:30 -0800)]
Merge pull request #5500 from nkukard/esc-strings2
More escaping
Dmitriy Zaporozhets [Tue, 5 Nov 2013 08:28:49 +0000 (10:28 +0200)]
New feature: Create file from UI
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Nigel Kukard [Mon, 4 Nov 2013 22:06:27 +0000 (22:06 +0000)]
More escaping
- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Dmitriy Zaporozhets [Mon, 4 Nov 2013 19:37:21 +0000 (19:37 +0000)]
Merge branch 'consistent-numbering' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 4 Nov 2013 19:36:07 +0000 (11:36 -0800)]
Number 3 was missing.
Dmitriy Zaporozhets [Mon, 4 Nov 2013 19:30:26 +0000 (19:30 +0000)]
Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Mon, 4 Nov 2013 19:28:07 +0000 (20:28 +0100)]
Include gitlab-shell in patch update doc
Dmitriy Zaporozhets [Mon, 4 Nov 2013 18:37:15 +0000 (20:37 +0200)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 4 Nov 2013 18:32:19 +0000 (10:32 -0800)]
Merge pull request #5507 from jojosch/project-issue-tracker-selection
Preselect the current issue tracker with selected="selected"
Dmitriy Zaporozhets [Mon, 4 Nov 2013 18:31:20 +0000 (10:31 -0800)]
Merge pull request #5521 from mynetx/ie10-css-gradients
Support -ms-linear-gradient style for IE10+
Dmitriy Zaporozhets [Mon, 4 Nov 2013 18:30:04 +0000 (10:30 -0800)]
Merge pull request #5528 from mcepl/patch-1
Fix name of RHEL
Dmitriy Zaporozhets [Mon, 4 Nov 2013 18:21:22 +0000 (18:21 +0000)]
Merge branch 'security_update_master' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 4 Nov 2013 17:00:11 +0000 (19:00 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 4 Nov 2013 15:00:35 +0000 (15:00 +0000)]
Merge branch 'ui/namespace_title' of /home/git/repositories/dzaporozhets/gitlabhq
Dmitriy Zaporozhets [Mon, 4 Nov 2013 13:18:55 +0000 (15:18 +0200)]
Always show namespace for project title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Matěj Cepl [Mon, 4 Nov 2013 09:08:13 +0000 (10:08 +0100)]
Fix name of RHEL
The company is called Red Hat, and its flagship product is Red Hat Enterprise Linux (commonly abbreviated as RHEL). There is no such thing as RedHat (and never was).
Jacob Vosmaer [Mon, 4 Nov 2013 08:29:14 +0000 (00:29 -0800)]
Merge pull request #5400 from lokedhs/master
When looking up a user by DN, use single scope
Dmitriy Zaporozhets [Mon, 4 Nov 2013 07:55:56 +0000 (23:55 -0800)]
Merge pull request #5512 from jhollingsworth/feature/missing-group-500-fix
Fixes 500 error when user types in wrong group name.
Dmitriy Zaporozhets [Mon, 4 Nov 2013 07:48:37 +0000 (23:48 -0800)]
Merge pull request #5519 from zzet/patch-3
Run tests in parallel on travis
Dmitriy Zaporozhets [Mon, 4 Nov 2013 07:07:25 +0000 (07:07 +0000)]
Merge branch 'gitlab_shell_174_for_master' of /home/git/repositories/gitlab/gitlabhq
Elias Mårtenson [Tue, 22 Oct 2013 07:55:44 +0000 (15:55 +0800)]
When looking up a user by DN, use single scope
The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.
One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.
This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.
J.M [Sat, 2 Nov 2013 22:19:35 +0000 (23:19 +0100)]
Support -ms-linear-gradient style for IE10+
Jacob Vosmaer [Sat, 2 Nov 2013 16:32:14 +0000 (17:32 +0100)]
Add security update info to 6.0-to-6.2.md
Jacob Vosmaer [Sat, 2 Nov 2013 16:24:43 +0000 (17:24 +0100)]
Clarify upgrade steps
Jacob Vosmaer [Sat, 2 Nov 2013 16:13:38 +0000 (17:13 +0100)]
Add 5.1-to-5.4 update path
Jacob Vosmaer [Sat, 2 Nov 2013 16:05:06 +0000 (17:05 +0100)]
Bump gitlab-shell in 5.4 and 6.2
Jacob Vosmaer [Sat, 2 Nov 2013 15:49:26 +0000 (16:49 +0100)]
Add security warnings to update docs
Andrew Kumanyaev [Sat, 2 Nov 2013 13:53:33 +0000 (16:53 +0300)]
Run tests in parallel on travis
Jason Hollingsworth [Fri, 1 Nov 2013 16:29:37 +0000 (11:29 -0500)]
Fixes 500 error when user types in wrong group name.
Jacob Vosmaer [Fri, 1 Nov 2013 15:38:55 +0000 (16:38 +0100)]
Use gitlab-shell 1.7.4
Dmitriy Zaporozhets [Fri, 1 Nov 2013 14:58:24 +0000 (16:58 +0200)]
Require gitlab-shell 1.7.4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Johannes Schleifenbaum [Fri, 1 Nov 2013 14:33:47 +0000 (15:33 +0100)]
Preselect the current issue tracker with selected="selected"
The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
Dmitriy Zaporozhets [Fri, 1 Nov 2013 14:29:28 +0000 (16:29 +0200)]
Revert "Escape strings"
This reverts commit
ce75f46bf7adb96ccc20f8ef3be581898ef05681.
Dmitriy Zaporozhets [Fri, 1 Nov 2013 14:25:06 +0000 (16:25 +0200)]
Revert "Best to escape strings not split them"
This reverts commit
aca7f56fef15da8cbe66ec88c1d1a364d4ae8181.
Dmitriy Zaporozhets [Fri, 1 Nov 2013 12:25:38 +0000 (14:25 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 1 Nov 2013 12:17:22 +0000 (12:17 +0000)]
Merge branch '6_0_to_6_2' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Fri, 1 Nov 2013 12:05:26 +0000 (13:05 +0100)]
Bump gitlab-shell to 1.7.3
Dmitriy Zaporozhets [Fri, 1 Nov 2013 12:03:35 +0000 (12:03 +0000)]
Merge branch 'security-upgrade' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Fri, 1 Nov 2013 10:56:31 +0000 (03:56 -0700)]
Merge pull request #5487 from perryfaro/fix-sidekiq-documentation
Change documentation about sidekiq
Perry Faro [Thu, 31 Oct 2013 19:19:57 +0000 (20:19 +0100)]
Fix sidekiq start text in documentation and gitlab:check
Dmitriy Zaporozhets [Fri, 1 Nov 2013 07:36:59 +0000 (09:36 +0200)]
Show only first line of commit message on dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 1 Nov 2013 07:28:30 +0000 (09:28 +0200)]
Mention GitLab CI 4.0 in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 1 Nov 2013 07:25:03 +0000 (09:25 +0200)]
Mention security improvements in CHAGENLOG for 6.3
Dmitriy Zaporozhets [Thu, 31 Oct 2013 17:57:51 +0000 (10:57 -0700)]
Merge pull request #5435 from karlhungus/feature_search_namespace_name_and_public
Allow searching by namespace name, include public projects
Dmitriy Zaporozhets [Thu, 31 Oct 2013 17:48:39 +0000 (19:48 +0200)]
Require gitlab-shell v1.7.3
Dmitriy Zaporozhets [Thu, 31 Oct 2013 14:35:06 +0000 (16:35 +0200)]
Correctly escape search query
Dmitriy Zaporozhets [Thu, 31 Oct 2013 12:57:11 +0000 (05:57 -0700)]
Merge pull request #5475 from nkukard/esc-strings
Escape strings
Dmitriy Zaporozhets [Thu, 31 Oct 2013 09:25:08 +0000 (11:25 +0200)]
Shell escape code search
Dmitriy Zaporozhets [Thu, 31 Oct 2013 08:42:48 +0000 (10:42 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 31 Oct 2013 08:42:15 +0000 (10:42 +0200)]
Update gitlab_git to recent version
Nigel Kukard [Thu, 31 Oct 2013 07:34:11 +0000 (07:34 +0000)]
Best to escape strings not split them
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Sytse Sijbrandij [Thu, 31 Oct 2013 00:27:40 +0000 (17:27 -0700)]
Fix numbering by indenting.
Sytse Sijbrandij [Thu, 31 Oct 2013 00:26:19 +0000 (17:26 -0700)]
Add numbers.
Sytse Sijbrandij [Thu, 31 Oct 2013 00:18:41 +0000 (17:18 -0700)]
Accept our license agreement.
Jacob Vosmaer [Wed, 30 Oct 2013 16:26:08 +0000 (09:26 -0700)]
Merge pull request #5474 from vollnhals/patch-1
Respect the configured redis URL when initializing the session store
vollnhals [Tue, 29 Oct 2013 17:02:01 +0000 (18:02 +0100)]
Respect the configured redis URL when initializing the session store
It was not possible to start Gitlab with a redis server running on another host or port. Every other subsystem that uses redis respects the settings in config/resque.yml.
This patch uses the configured url from the cache_store configuration.
The cache_store configuration already loads the correct redis url from config/resque.yml.
Closes #5406
Dmitriy Zaporozhets [Wed, 30 Oct 2013 14:54:06 +0000 (07:54 -0700)]
Merge pull request #5484 from jojosch/edit-file-on-commit-disable
Check if a file is editied "on" a branch or a commit.
Johannes Schleifenbaum [Wed, 30 Oct 2013 10:20:43 +0000 (11:20 +0100)]
Check if a file is editied "on" a branch or a commit.
The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.
If the user accesses a path like "/edit/master/README" show the file
edit form (just like before).
If the user accesses a path like
"/edit/
8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.
fixes #5482
Sytse Sijbrandij [Tue, 29 Oct 2013 23:46:42 +0000 (16:46 -0700)]
Include a note if there are security fixes.
Nigel Kukard [Tue, 29 Oct 2013 18:06:10 +0000 (18:06 +0000)]
Escape strings
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Jacob Vosmaer [Tue, 29 Oct 2013 17:06:12 +0000 (18:06 +0100)]
Add 6.0-to-6.2 update guide
Dmitriy Zaporozhets [Tue, 29 Oct 2013 16:13:51 +0000 (18:13 +0200)]
gitlab-ci service api: clean values instead of destroy
Dmitriy Zaporozhets [Tue, 29 Oct 2013 16:04:07 +0000 (16:04 +0000)]
Merge branch 'api/gitlab-ci' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 29 Oct 2013 14:39:46 +0000 (16:39 +0200)]
API: set gitlab-ci service for project
Dmitriy Zaporozhets [Tue, 29 Oct 2013 09:59:12 +0000 (09:59 +0000)]
Merge branch '51-to-60-update' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 28 Oct 2013 20:13:13 +0000 (20:13 +0000)]
Merge branch 'security_vulnerabilities' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 28 Oct 2013 15:21:39 +0000 (15:21 +0000)]
Merge branch 'init_exit_status' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Mon, 28 Oct 2013 14:44:28 +0000 (15:44 +0100)]
Refer to disclosure policy in CONTRIBUTING.md