Commit Graph
5535 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets da98cebc5b Merge pull request #4314 from Undev/feature/redesign_forms
Switch form from table to plain form without member list
2013-06-14 05:20:22 -07:00
Dmitriy Zaporozhets a59fe739fe IMprove MR validation logic 2013-06-14 15:17:47 +03:00
Dmitriy Zaporozhets 977146f568 Prevent creating several open merge requests for same branches 2013-06-14 15:03:22 +03:00
Dmitriy Zaporozhets b4e8fea274 Refactor grack auth module. Add git over http wiki support 2013-06-14 14:42:55 +03:00
Andrey Kumanyaev 815c186b29 Switch for from table to plain form without member list 2013-06-14 15:08:21 +04:00
Dmitriy Zaporozhets a8bcb9a5d5 Fix mailer test 2013-06-14 12:58:12 +03:00
Dmitriy Zaporozhets 1cbfc8d0af Fix tab tests. Prevent 500 if user.last_sign_in_at is nil 2013-06-14 08:37:55 +03:00
Dmitriy Zaporozhets 74c8a635ce Move project nav checks to helper 2013-06-13 22:58:27 +03:00
Dmitriy Zaporozhets 313ac55539 Merge branch 'feature/password_expire' of /home/git/repositories/gitlab/gitlabhq 2013-06-13 18:09:26 +00:00
Dmitriy Zaporozhets 6838304a85 Force user password change for users created by admin 2013-06-13 21:06:27 +03:00
Dmitriy Zaporozhets 00882b3c33 Prevent infinit password change by settin password_expires_at to nil 2013-06-13 20:21:51 +03:00
Dmitriy Zaporozhets 46231f0f1d Fix password set form and infinite loop 2013-06-13 20:16:48 +03:00
Dmitriy Zaporozhets fbf6989903 Force admin to change password after first sign-in 2013-06-13 20:06:33 +03:00
Dmitriy Zaporozhets 94be732026 Add password_expires_at to users table 2013-06-13 20:01:35 +03:00
Dmitriy Zaporozhets cfd15eb480 Better naming for some project tabs 2013-06-13 19:56:26 +03:00
Dmitriy Zaporozhets 5b40780290 Password expire: implement password resource inside profile. add before_fiter check 2013-06-13 19:53:04 +03:00
Dmitriy Zaporozhets 81a9e81fae use bold font for active tab 2013-06-13 17:47:04 +03:00
Dmitriy Zaporozhets 200c5f5894 Better commit button after file edit 2013-06-13 17:41:21 +03:00
Dmitriy Zaporozhets 18ea0e0ea7 Prevent overflow of comment code in event body. Add border-radius to highlight code inside note body 2013-06-13 10:59:27 +03:00
Dmitriy Zaporozhets 7a53215d75 Hide sign-in bottom block if no providers 2013-06-13 10:42:45 +03:00
Dmitriy Zaporozhets 23b3f0518b Team admin should be able to see settings tab 2013-06-13 10:24:01 +03:00
Dmitriy Zaporozhets a6e44bfdae Merge pull request #4296 from mmlb/fix-asciidoc-rendering
Add asciidoctor gem.
2013-06-13 00:15:52 -07:00
Dmitriy Zaporozhets 96c06d7f5f update omniauth dependency 2013-06-13 10:07:06 +03:00
Dmitriy Zaporozhets 2c3ddacbd7 Disable threadsafe! for rake tasks 2013-06-13 09:58:03 +03:00
Manuel MendezandManuel Mendez 0023a27ec0 Add asciidoctor gem.
Fixes issue #3506.
2013-06-12 16:20:58 -07:00
Dmitriy Zaporozhets 995e656add Add path blacklist 2013-06-12 22:11:35 +03:00
Dmitriy Zaporozhets 8f52501eb5 Fix inline diff issue. See #3150 2013-06-12 16:43:58 +03:00
Dmitriy Zaporozhets 5d0929458c Merge branch 'sing-test-in-readme' of /home/git/repositories/gitlab/gitlabhq 2013-06-12 10:43:45 +00:00
Sytse Sijbrandij 8bee0e1d32 Add single test to the readme, should not use rake. 2013-06-12 10:00:05 +02:00
Dmitriy Zaporozhets 964f7a1196 Merge branch 'feature/threadsafe' of /home/git/repositories/gitlab/gitlabhq 2013-06-11 15:54:15 +00:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 5511a731bc Enable threadsafe. Preload lib/ 2013-06-11 18:03:13 +03:00
Dmitriy Zaporozhets 159eee8dfd Merge pull request #4148 from jlgeering/secure-gravatar-urls
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
2013-06-11 07:07:51 -07:00
Dmitriy Zaporozhets 3816387cc9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-06-11 16:58:21 +03:00
Dmitriy Zaporozhets e06e5633b3 Refactor Project.abandoned method 2013-06-11 16:57:52 +03:00
Dmitriy Zaporozhets 9db06da4fa Merge pull request #4176 from Andrew8xx8/patch-2
500 error on showing not existed commit fixed
2013-06-11 06:44:18 -07:00
Dmitriy Zaporozhets 4daf68b57f Style page for project assign to team. Fix test for admin:teams 2013-06-11 15:50:25 +03:00
Dmitriy Zaporozhets 62a9bb5af7 Restyle admin:teams:show 2013-06-11 15:39:19 +03:00
Dmitriy Zaporozhets ae90107caa mention puma cluster mode for bigger instances 2013-06-11 15:10:45 +03:00
Dmitriy Zaporozhets 0ee2668a4f Fixed users_select_tag method 2013-06-11 14:27:27 +03:00
Dmitriy Zaporozhets c058aaf7dc Keep namespace name/username synced with user 2013-06-11 14:22:33 +03:00
Dmitriy Zaporozhets 6eb045fc98 Prevent Project.all & User.all in selectboxes 2013-06-11 14:17:37 +03:00
Dmitriy Zaporozhets 52f312a8a8 fix group:people tests after prev commit 2013-06-11 13:54:58 +03:00
Dmitriy Zaporozhets c38a6fe173 Group people management: replace selectbox with ajax one. 2013-06-11 13:51:22 +03:00
Dmitriy Zaporozhets ef935aba4f Fix README.txt rendering. Solution by @dfyx 2013-06-11 12:31:05 +03:00
Dmitriy Zaporozhets 6d6d084c39 Merge pull request #4065 from bbodenmiller/release-todos
add creating new release guide
2013-06-11 02:13:58 -07:00
Dmitriy Zaporozhets 5cd988249f Merge pull request #4140 from amacarthur/restore-fixes-clean
fixes for gitlab restore with non-standard backup and repo dirs
2013-06-11 02:12:06 -07:00
Dmitriy Zaporozhets 9a0e7c0e85 Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check
Fix abort gitlab:app:check
2013-06-11 01:48:18 -07:00
Dmitriy Zaporozhets 1b4a994162 Merge pull request #4244 from adaugherity/check_script_user
use git user in check script
2013-06-11 01:06:50 -07:00
Dmitriy Zaporozhets 9ae26cd128 Merge pull request #4257 from jojosch/fix/routing-commit-with-#
Routing fix Commit-List: branch with # and + in name
2013-06-11 01:03:03 -07:00