Commit Graph
6803 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fd39c80f8b No text shadow for state-label 2013-10-17 12:33:39 +03:00
Dmitriy Zaporozhets 13c192d44c Version up to beta 2013-10-17 12:32:00 +03:00
Dmitriy Zaporozhets a4de8f71c7 Minor UI improvement for ui-box-show 2013-10-17 12:31:49 +03:00
Dmitriy Zaporozhets 60e2a6563d Add description to issues, projects in development fixtures 2013-10-17 12:27:09 +03:00
Dmitriy Zaporozhets 7b70d81c83 Speed up tests 2013-10-17 10:52:38 +03:00
Dmitriy Zaporozhets 91a31d767f Order milestone due date on issues page filter 2013-10-17 10:01:48 +03:00
Dmitriy Zaporozhets 399e634112 Fix GollumWiki::CouldNotCreateWikiError during tests 2013-10-17 09:48:35 +03:00
Dmitriy Zaporozhets 03dba1fd42 Merge pull request #5344 from amacarthur/thread-variable-fix
Fixing unsafe use of Thread.current variable :current_user
2013-10-16 23:30:44 -07:00
Dmitriy Zaporozhets dad831662a Merge pull request #5350 from NARKOZ/patch-0
fix variable name
2013-10-16 22:59:39 -07:00
Dmitriy Zaporozhets 9afc930b99 Make ui-box-show more visible. Refactor some css classes 2013-10-16 20:42:42 +03:00
Nihad Abbasov 12420a2256 refactor by_username_or_id 2013-10-16 22:31:46 +05:00
Nihad Abbasov e09cc195a7 fix variable name 2013-10-16 22:28:39 +05:00
Dmitriy Zaporozhets 6404d69780 Better UX for blocked users in admin area 2013-10-16 20:19:25 +03:00
Dmitriy Zaporozhets e9142c6f2c Merge branch 'grep_fix' of /home/git/repositories/gitlab/gitlabhq 2013-10-16 11:44:47 +00:00
Marin Jankovski f3d77a7661 Add invert match to sidekiq match. 2013-10-16 13:39:09 +02:00
Dmitriy Zaporozhets 615d859f94 Merge branch 'logrotate' of /home/git/repositories/gitlab/gitlabhq 2013-10-16 10:08:53 +00:00
Dmitriy Zaporozhets 2c0f4c7664 Merge branch 'unicorn_rake_tasks' of /home/git/repositories/gitlab/gitlabhq 2013-10-16 09:31:17 +00:00
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
Jacob Vosmaer d378332ff9 Add logrotate setup to the installation guide 2013-10-16 10:38:13 +02:00
Dmitriy Zaporozhets 253850dd6d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-16 09:27:32 +03:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Jacob Vosmaer 6a7d63aa47 Move unicorn and sidekiq commands into bash script 2013-10-15 22:48:57 +02: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