home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,958 Commits 48 Branches 340 Tags
dfe19b2b84498af2eb0c7e401fda8f9eddfd0f46
Commit Graph
6958 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Hollingsworth dfe19b2b84 Fixes 500 error when user types in wrong group name. 2013-11-01 11:29:37 -05:00
Dmitriy Zaporozhets 4c47a89fa5 Require gitlab-shell 1.7.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 16:58:24 +02:00
Dmitriy Zaporozhets 592d1fabd6 Revert "Escape strings" 
This reverts commit ce75f46bf7.
 2013-11-01 16:29:28 +02:00
Dmitriy Zaporozhets 482a39abb0 Revert "Best to escape strings not split them" 
This reverts commit aca7f56fef.
 2013-11-01 16:25:06 +02:00
Dmitriy Zaporozhets c27e49e916 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-01 14:25:38 +02:00
Dmitriy Zaporozhets b936314e6b Merge branch '6_0_to_6_2' of /home/git/repositories/gitlab/gitlabhq 2013-11-01 12:17:22 +00:00
Jacob Vosmaer fa6f198309 Bump gitlab-shell to 1.7.3 2013-11-01 13:05:26 +01:00
Dmitriy Zaporozhets 9c48f99592 Merge branch 'security-upgrade' of /home/git/repositories/gitlab/gitlabhq 2013-11-01 12:03:35 +00:00
Jacob Vosmaer 1cb18edf76 Merge pull request #5487 from perryfaro/fix-sidekiq-documentation 
Change documentation about sidekiq
 2013-11-01 03:56:31 -07:00
Perry Faro 5d98afb55b Fix sidekiq start text in documentation and gitlab:check 2013-11-01 11:52:44 +01:00
Dmitriy Zaporozhets 844f8fd213 Show only first line of commit message on dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 09:36:59 +02:00
Dmitriy Zaporozhets 6055c615db Mention GitLab CI 4.0 in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 09:28:30 +02:00
Dmitriy Zaporozhets bfd9f81407 Mention security improvements in CHAGENLOG for 6.3 2013-11-01 09:25:03 +02:00
Dmitriy Zaporozhets a27e4404db Merge pull request #5435 from karlhungus/feature_search_namespace_name_and_public 
Allow searching by namespace name, include public projects
 2013-10-31 10:57:51 -07:00
Dmitriy Zaporozhets 9ab4539a62 Require gitlab-shell v1.7.3 2013-10-31 19:48:39 +02:00
Dmitriy Zaporozhets b55f22afc0 Correctly escape search query 2013-10-31 16:35:06 +02:00
Dmitriy Zaporozhets 959863b92b Merge pull request #5475 from nkukard/esc-strings 
Escape strings
 2013-10-31 05:57:11 -07:00
Dmitriy Zaporozhets d55428b842 Shell escape code search 2013-10-31 11:25:08 +02:00
Dmitriy Zaporozhets a1ded95491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-31 10:42:48 +02:00
Dmitriy Zaporozhets 1040e88e56 Update gitlab_git to recent version 2013-10-31 10:42:15 +02:00
Nigel Kukard aca7f56fef Best to escape strings not split them 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-10-31 07:34:11 +00:00
Jacob Vosmaer 70a9c377cd Merge pull request #5474 from vollnhals/patch-1 
Respect the configured redis URL when initializing the session store
 2013-10-30 09:26:08 -07:00
vollnhalsandLion Vollnhals 67c18aa941 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
 2013-10-30 17:11:56 +01:00
Dmitriy Zaporozhets a967f1229b Merge pull request #5484 from jojosch/edit-file-on-commit-disable 
Check if a file is editied "on" a branch or a commit.
 2013-10-30 07:54:06 -07:00
Johannes Schleifenbaum cc505f550d 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
 2013-10-30 11:34:26 +01:00
Sytse Sijbrandij dfbb7b3ae9 Include a note if there are security fixes. 2013-10-29 16:46:42 -07:00
Nigel Kukard ce75f46bf7 Escape strings 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-10-29 18:06:10 +00:00
Jacob Vosmaer f0e6ebabd1 Add 6.0-to-6.2 update guide 2013-10-29 18:06:12 +01:00
Dmitriy Zaporozhets ee0e9830c1 gitlab-ci service api: clean values instead of destroy 2013-10-29 18:13:51 +02:00
Dmitriy Zaporozhets 0b57c118fc Merge branch 'api/gitlab-ci' of /home/git/repositories/gitlab/gitlabhq 2013-10-29 16:04:07 +00:00
Dmitriy Zaporozhets d636ad49bf API: set gitlab-ci service for project 2013-10-29 16:39:46 +02:00
Dmitriy Zaporozhets d71914ca23 Merge branch '51-to-60-update' of /home/git/repositories/gitlab/gitlabhq 2013-10-29 09:59:12 +00:00
Dmitriy Zaporozhets 4ff157d40f Merge branch 'security_vulnerabilities' of /home/git/repositories/gitlab/gitlabhq 2013-10-28 20:13:13 +00:00
Dmitriy Zaporozhets 4a715c7360 Merge branch 'init_exit_status' of /home/git/repositories/gitlab/gitlabhq 2013-10-28 15:21:39 +00:00
Jacob Vosmaer 8706890f9b Refer to disclosure policy in CONTRIBUTING.md 2013-10-28 15:44:28 +01:00
Dmitriy Zaporozhets ff7073ac23 master is on 6.3.0.pre now 2013-10-28 13:29:37 +02:00
Dmitriy Zaporozhets bc0a419eca Universal update guide for patch versions 2013-10-28 13:23:09 +02:00
Dmitriy Zaporozhets 0040139bbe Use same color for event body 2013-10-28 11:06:39 +02:00
Dmitriy Zaporozhets b43084d180 Add hero-unit to /help 2013-10-27 17:06:02 +02:00
Dmitriy Zaporozhets 890c4f9848 Minor restyle for event filter 2013-10-27 16:46:16 +02:00
Dmitriy Zaporozhets 05b5e318a1 Reduce font-size for event-title 2013-10-27 16:38:38 +02:00
Dmitriy Zaporozhets 4faa895623 rounded avatars 2013-10-27 16:37:17 +02:00
Dmitriy Zaporozhets 6b0501b4c0 Better font size for projects list on dashboard 2013-10-27 16:15:08 +02:00
Dmitriy Zaporozhets 6981c207a0 Merge pull request #5453 from perryfaro/password-page 
Reset buttons/links on the reset password page
 2013-10-27 07:09:13 -07:00
Dmitriy Zaporozhets 0fa3f37dea Merge pull request #5448 from flewid/patch-1 
Update installation.md
 2013-10-27 06:58:52 -07:00
Perry Faro 3fb6ad9020 Reset button/link on the reset password page. Fixes #5418 2013-10-27 11:50:18 +01:00
flewid 056060f94b Update installation.md 
Updated instructions to include proper stable. Otherwise they fail due to Rack extensions required below.
 2013-10-25 19:41:59 -05:00
Dmitriy Zaporozhets 235a6182ac Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq 2013-10-25 09:32:20 +00:00
Jacob Vosmaer 4727fa3fcc Report application status through init exit code 2013-10-25 11:26:22 +02:00
Jacob Vosmaer 90086fe2dc Restore sidekiq rake tasks 2013-10-25 09:39:31 +02:00