home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,783 Commits 48 Branches 340 Tags
8f4fdd94d40b97ad0f80f0db7eb60ebcaa6eac8a
Commit Graph
6783 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 8f4fdd94d4 Merge branch 'sidekiq_admin_advice' of /home/git/repositories/gitlab/gitlabhq 2013-10-16 09:30:12 +00:00
Jacob Vosmaer babba432f1 Use service gitlab reload to restart sidekiq 2013-10-16 10:47:10 +02:00
Dmitriy Zaporozhets 253850dd6d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-16 09:27:32 +03:00
Dmitriy Zaporozhets 7c4db532ff Merge branch '6_0_update_troubleshooting' of /home/git/repositories/gitlab/gitlabhq 2013-10-15 17:20:36 +00:00
Dmitriy Zaporozhets 4649c6e3b1 Merge branch 'release-procedure' of /home/git/repositories/gitlab/gitlabhq 2013-10-15 17:19:35 +00:00
Dmitriy Zaporozhets 7ea00b183c Merge branch 'sidekiq_workers_show' of /home/git/repositories/gitlab/gitlabhq 2013-10-15 17:19:18 +00:00
Marin Jankovski a271570ea9 Show explanation . 2013-10-15 15:28:53 +02:00
Jacob Vosmaer c69b2856b1 Add troubleshooting info to 5.4-to-6.0.md 2013-10-15 14:58:26 +02:00
Jacob Vosmaer a8eb525e72 Merge pull request #5168 from DirkR/master 
Added description for Redis connection via unix socket
 2013-10-15 05:44:06 -07:00
Marin Jankovski 4886d8fd03 Show sidekiq running processes in the background_jobs page. 2013-10-15 13:24:17 +02:00
Sytse Sijbrandij 948af77367 Add last actions to the repo as a reference. 2013-10-15 11:51:56 +02:00
Dmitriy Zaporozhets 17df09b79e Remove unnecessary steps from update 6.1-6.2 2013-10-15 12:32:22 +03:00
Dmitriy Zaporozhets f4733b0026 Confirm seed users 2013-10-15 12:23:25 +03:00
Dmitriy Zaporozhets 9f9be175e0 Merge branch 'feature/confirmable' of /home/git/repositories/gitlab/gitlabhq 2013-10-15 09:21:26 +00:00
Dmitriy Zaporozhets f4d68f398f set current_user for project spec 2013-10-15 11:29:22 +03:00
Dmitriy Zaporozhets 01186f9fc6 Show confirmation status in profile 2013-10-15 11:19:19 +03:00
Dmitriy Zaporozhets 2e8b0fa5cf Oauth users and users created by admin should be confirmed immediatly 2013-10-15 09:59:58 +03:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User 
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
 2013-10-15 09:56:04 +03:00
Dmitriy Zaporozhets db7d154970 More entries in CHANGELOG 2013-10-15 09:25:14 +03:00
Dmitriy Zaporozhets 8f237526f3 Merge pull request #5337 from dpursehouse/improve-repository-import-message 
Improve the repository import message
 2013-10-14 22:53:01 -07:00
David Pursehouse 2fbe4fad13 Improve the repository import message 2013-10-15 13:58:05 +09:00
Dmitriy Zaporozhets d1a054c513 Merge branch 'fix/relative_links_in_readme' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 18:31:57 +00:00
Dmitriy Zaporozhets 18a6f31b6a Merge branch 'feature/api_iids' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 15:24:17 +00:00
Marin Jankovski e649ea2fc5 Links in Readme in tree view. 2013-10-14 16:47:46 +02:00
Dmitriy Zaporozhets d20db103c1 Merge branch 'readding_group_member' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 14:41:13 +00:00
Dmitriy Zaporozhets eda5b3b1c5 Fix relative links from Help#API page 2013-10-14 16:47:05 +03:00
Dmitriy Zaporozhets 02693b72a4 Explain iid in API 2013-10-14 16:40:16 +03:00
Dmitriy Zaporozhets 12800e5445 Extend API Issues, MergeRequets, Milestones with iid field 2013-10-14 16:39:54 +03:00
Marin Jankovski 97cf31c4cb Update user access level when adding to group. 2013-10-14 15:15:14 +02:00
Dmitriy Zaporozhets ace9ff4a46 Merge pull request #5305 from saymedia/master 
Fix the sigil for merge request emails
 2013-10-14 06:13:43 -07:00
Dmitriy Zaporozhets 627cb28f11 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-14 14:08:41 +03:00
Dmitriy Zaporozhets 04aba7781a Merge branch 'web_hook_project_id' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 10:48:05 +00:00
Dmitriy Zaporozhets 3cbfb1ee7c Remove .git from project url end redirect 
Ex. redirect from
  localhost/group/project.git
to
  localhost/group/project

It used to prevent 404 error when follow submodule http link
like http://localhost/group/project.git
 2013-10-14 13:27:39 +03:00
Dmitriy Zaporozhets 55327823c4 Added links to submodules 2013-10-14 13:27:32 +03:00
Marin Jankovski 9ed59ee9f0 Include project_id in webhook payload. 2013-10-14 12:03:25 +02:00
Dmitriy Zaporozhets 2c0c9e26e8 Merge branch 'syshook-docs' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 08:46:27 +00:00
Sytse Sijbrandij 3888d94adc System hooks docs links to admin area. 2013-10-14 09:24:38 +02:00
Dmitriy Zaporozhets 1073019d36 Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 07:00:58 +00:00
Dmitriy Zaporozhets fdd64bf347 Merge branch 'cookies-in-redis' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 06:57:43 +00:00
Dmitriy Zaporozhets 41f63acc84 Fix README detection for subdir 2013-10-13 16:03:16 +03:00
Dmitriy Zaporozhets 5c67c88731 Improve admin dashboard UX 2013-10-13 14:38:20 +03:00
Dmitriy Zaporozhets b65a0461d1 Revert "Move warning about 0 ssh keys to bottom of page" 
This reverts commit 20c47923a1.
 2013-10-13 14:22:40 +03:00
Dmitriy Zaporozhets 20c47923a1 Move warning about 0 ssh keys to bottom of page 2013-10-13 11:11:10 +03:00
Dmitriy Zaporozhets 70b793eb7a Lighter border color for ui-box. Show closed keyword for issues list 2013-10-13 11:00:51 +03:00
Dmitriy Zaporozhets 995ce5fdc7 Fix 500 error on page with submodules 2013-10-12 10:01:27 +03:00
Dmitriy Zaporozhets d43d7471c1 Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhq 2013-10-12 05:06:19 +00:00
Marin Jankovski ad3defa3c2 Skip relative links render in help page. 2013-10-11 21:41:33 +02:00
Sytse Sijbrandij ba7c1764be The cookie store is vulnerable to session replay attacks. 2013-10-11 17:54:46 +02:00
Dmitriy Zaporozhets f81532b5b9 Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:02:30 +00:00
Dmitriy Zaporozhets b883d94f96 Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:00:05 +00:00