OSDN Git Service
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>
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
Dmitriy Zaporozhets [Mon, 28 Oct 2013 11:29:37 +0000 (13:29 +0200)]
master is on 6.3.0.pre now
Dmitriy Zaporozhets [Mon, 28 Oct 2013 11:23:09 +0000 (13:23 +0200)]
Universal update guide for patch versions
Dmitriy Zaporozhets [Mon, 28 Oct 2013 09:06:39 +0000 (11:06 +0200)]
Use same color for event body
Dmitriy Zaporozhets [Sun, 27 Oct 2013 15:06:02 +0000 (17:06 +0200)]
Add hero-unit to /help
Dmitriy Zaporozhets [Sun, 27 Oct 2013 14:46:16 +0000 (16:46 +0200)]
Minor restyle for event filter
Dmitriy Zaporozhets [Sun, 27 Oct 2013 14:38:38 +0000 (16:38 +0200)]
Reduce font-size for event-title
Dmitriy Zaporozhets [Sun, 27 Oct 2013 14:37:17 +0000 (16:37 +0200)]
rounded avatars
Dmitriy Zaporozhets [Sun, 27 Oct 2013 14:15:08 +0000 (16:15 +0200)]
Better font size for projects list on dashboard
Dmitriy Zaporozhets [Sun, 27 Oct 2013 14:09:13 +0000 (07:09 -0700)]
Merge pull request #5453 from perryfaro/password-page
Reset buttons/links on the reset password page
Dmitriy Zaporozhets [Sun, 27 Oct 2013 13:58:52 +0000 (06:58 -0700)]
Merge pull request #5448 from flewid/patch-1
Update installation.md
Perry Faro [Sun, 27 Oct 2013 10:50:18 +0000 (11:50 +0100)]
Reset button/link on the reset password page. Fixes #5418
flewid [Sat, 26 Oct 2013 00:41:59 +0000 (19:41 -0500)]
Update installation.md
Updated instructions to include proper stable. Otherwise they fail due to Rack extensions required below.
Dmitriy Zaporozhets [Fri, 25 Oct 2013 09:32:20 +0000 (09:32 +0000)]
Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Fri, 25 Oct 2013 09:26:22 +0000 (11:26 +0200)]
Report application status through init exit code
Jacob Vosmaer [Fri, 25 Oct 2013 07:39:31 +0000 (09:39 +0200)]
Restore sidekiq rake tasks
Dmitriy Zaporozhets [Thu, 24 Oct 2013 18:46:39 +0000 (11:46 -0700)]
Merge pull request #5436 from Seed-Of-Hate/master
Fix for issue #5431
Dmitriy Zaporozhets [Thu, 24 Oct 2013 17:49:56 +0000 (17:49 +0000)]
Merge branch 'install_git_from_source' of /home/git/repositories/gitlab/gitlabhq
arul [Thu, 24 Oct 2013 17:27:23 +0000 (19:27 +0200)]
Fix for issue #5431
Izaak Alpert [Thu, 24 Oct 2013 15:16:14 +0000 (11:16 -0400)]
Allow searching by namespace name, include public projects
GITLAB-1457 (GITLAB-836)
Change-Id: If8e2474bc6908accca51f395f58937687f101b58
Dmitriy Zaporozhets [Thu, 24 Oct 2013 15:17:53 +0000 (18:17 +0300)]
Update rails to 3.2.15
Dmitriy Zaporozhets [Thu, 24 Oct 2013 14:18:56 +0000 (17:18 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 24 Oct 2013 14:17:22 +0000 (17:17 +0300)]
Allow git clone with http for GitLab CI service:
If you enable GitLab CI for project you will be able to clone project
source code with next command:
git clone http://gitlab-ci-token:XXXXXXXXXXXX@host:project.git
Requires for GitLab CI 4.0
Jacob Vosmaer [Thu, 24 Oct 2013 14:11:45 +0000 (07:11 -0700)]
Merge pull request #4986 from Machiel/patch-1
Added git command to change shell to 1.1.0 to make sure the check passes
Dmitriy Zaporozhets [Thu, 24 Oct 2013 13:28:18 +0000 (06:28 -0700)]
Merge pull request #5422 from fintler/patch-1
Non-logic wording and grammar for the new group view
Dmitriy Zaporozhets [Thu, 24 Oct 2013 13:27:44 +0000 (06:27 -0700)]
Merge pull request #5326 from Rovanion/init-fix
Made stop message make more sense, app_root now uses the user name.
Jacob Vosmaer [Thu, 24 Oct 2013 12:59:44 +0000 (14:59 +0200)]
Add a combined update doc from 5.1 to 6.0
Rovanion Luckey [Thu, 24 Oct 2013 12:55:40 +0000 (14:55 +0200)]
Updated the init script, now waits for pids
Dmitriy Zaporozhets [Thu, 24 Oct 2013 12:46:54 +0000 (15:46 +0300)]
Disable text shadow for ui-box
Dmitriy Zaporozhets [Thu, 24 Oct 2013 07:08:42 +0000 (00:08 -0700)]
Merge pull request #5428 from weisjohn/patch-2
Typo fixed
Dmitriy Zaporozhets [Thu, 24 Oct 2013 07:08:01 +0000 (00:08 -0700)]
Merge pull request #4968 from pdf/issue_4831
Expand refs constraints to include valid characters
Peter Fern [Mon, 2 Sep 2013 10:48:32 +0000 (20:48 +1000)]
Expand refs constraints to include valid characters
Fixes #4831, #4865, #4932
John Weis [Wed, 23 Oct 2013 20:53:06 +0000 (16:53 -0400)]
Typo fixed
"ssending" to "sending"
Dmitriy Zaporozhets [Wed, 23 Oct 2013 16:40:02 +0000 (09:40 -0700)]
Merge pull request #5416 from Popl7/fix_max_size_avatar_upload_readme
fixed maximum avatar size in changelog
Dmitriy Zaporozhets [Wed, 23 Oct 2013 16:29:29 +0000 (19:29 +0300)]
Prevent 500 error if cant detect branches for commit
Jon Bringhurst [Wed, 23 Oct 2013 15:33:29 +0000 (09:33 -0600)]
Non-logic wording and grammar for the new group view
Jacob Vosmaer [Tue, 22 Oct 2013 12:34:19 +0000 (14:34 +0200)]
Clarify that Git 1.8.x is OK
Jacob Vosmaer [Tue, 22 Oct 2013 12:43:00 +0000 (14:43 +0200)]
Include full dependencies for Git compilation
Jacob Vosmaer [Tue, 22 Oct 2013 12:41:08 +0000 (14:41 +0200)]
Divide Git installation instructions in two
Jacob Vosmaer [Tue, 22 Oct 2013 12:37:06 +0000 (14:37 +0200)]
Edit config/gitlab.yml when compiling git
Steven Thonus [Wed, 23 Oct 2013 08:34:43 +0000 (10:34 +0200)]
fixed maximum avatar size in changelog
Jacob Vosmaer [Wed, 23 Oct 2013 07:58:53 +0000 (00:58 -0700)]
Merge pull request #5395 from dpursehouse/more-label-fixes
More label fixes
Dmitriy Zaporozhets [Wed, 23 Oct 2013 07:11:54 +0000 (10:11 +0300)]
Refactor and restyle Admin#background_jobs page