Commit Graph
5574 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 059baa09f9 Merge branch 'gem-update-policy' of /home/git/repositories/gitlab/gitlabhq 2013-06-25 06:17:54 +00:00
Dmitriy Zaporozhets 6d15e64588 Merge branch 'animated-gif' of /home/git/repositories/gitlab/gitlabhq 2013-06-25 06:17:14 +00:00
Sytse Sijbrandij 32e029d261 Detail gem update policy. 2013-06-24 18:54:08 +02:00
Dmitriy Zaporozhets 884498c59f Merge pull request #4410 from senny/dont_console_log_in_code
we should not use `console.log` in production code...
2013-06-24 08:43:53 -07:00
Yves Senn f3a9240237 we should not use console.log in production code... 2013-06-24 17:40:23 +02:00
Dmitriy Zaporozhets 20ed39e781 Merge pull request #3898 from jacargentina/notifymentioned
Notify email to mentioned users; show participants ala github on issuables
2013-06-24 08:20:58 -07:00
Javier Castro cf35d19c2e Show participants on issues, including mentions, and notify email to all participants 2013-06-24 11:55:44 -03:00
Dmitriy Zaporozhets a324960d92 Merge pull request #4407 from jackbot/master
Database seeding failing
2013-06-24 06:56:07 -07:00
Jack Weeden 905eb17614 Merge branch 'master' of github.com:jackbot/gitlabhq 2013-06-24 14:53:40 +01:00
Jack Weeden a5d6bbe0af cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures 2013-06-24 14:21:46 +01:00
Yves Senn b8eee565a8 Merge pull request #4369 from zeehio/patch-1
[Doc] Update 5.0 to 5.1: Recompile assets
2013-06-24 00:12:12 -07:00
Sytse Sijbrandij 862fbb62b2 Add animated screenshots. 2013-06-23 21:54:24 +02:00
Dmitriy Zaporozhets ac6c912860 Merge pull request #4385 from Razer6/fix_update_docs_for_master
Fix wrong file versions in update docs (5.2 to 5.3)
2013-06-22 04:45:41 -07:00
Robert Schilling 8c1ac6f3c6 Fix wrong file versions in update docs 2013-06-22 13:29:51 +02:00
Dmitriy Zaporozhets f4e2865d2f Merge pull request #3408 from NARKOZ/patch-2
add db index for authentication_token column in users table
2013-06-22 01:14:07 -07:00
Dmitriy Zaporozhets a962217db8 Merge branch 'install-guide-improvements' of /home/git/repositories/gitlab/gitlabhq 2013-06-21 19:49:14 +00:00
Sytse Sijbrandij 76f2e065ea Merge branch 'master' into install-guide-improvements
Conflicts:
	doc/install/installation.md
2013-06-21 21:18:20 +02:00
Sergio Oller 98423a37b2 [Doc] Update 5.0 to 5.1: Recompile assets
Recompiling assets on the update is needed or main menu appearance may not load properly. This has been mentioned on issues #3722 and #3978.

The command has been tested several by users on those issues and by myself.

Thanks for your time and attention.
2013-06-21 11:05:21 +02:00
Dmitriy Zaporozhets 48d372725a Update docs from 5.2 to 5.3 2013-06-20 09:52:47 +03:00
Dmitriy Zaporozhets 148eade9d7 Version to 5.3 v5.3.0 2013-06-19 19:57:32 +03:00
Dmitriy Zaporozhets d899fcdd2d Merge pull request #4325 from zzet/patch-1
Remove unused but slow code
2013-06-18 11:31:17 -07:00
Dmitriy Zaporozhets cc5440e82a Use navless layout for snippets page 2013-06-18 17:43:49 +03:00
Dmitriy Zaporozhets 68b601f6af Fix Issue.open_for 2013-06-17 20:00:50 +03:00
Yves Senn ed9b661c9d Merge pull request #4279 from barendt/patch-2
Fix paths to the Contents Markdown pages
2013-06-17 06:05:10 -07:00
Andrew Kumanyaev 26994b5d30 Remove unused, but slow code 2013-06-17 15:52:54 +04:00
Dmitriy Zaporozhets 2e839cee93 Fixed tests. Fixed overrided scope. Better usability for milestone view 2013-06-17 11:57:37 +03:00
Dmitriy Zaporozhets b1bdd82992 Merge pull request #4269 from dosire/scrum-view-for-milestone
Scrum view style milestone view.
2013-06-16 23:32:09 -07:00
Sytse Sijbrandij 8ccad7c3c7 Fix spelling error and make sure you never log in as git user so you never have to logout to run sudo. 2013-06-16 22:06:33 +02:00
Dmitriy Zaporozhets 593dfc40df FIx userteams tests 2013-06-15 13:10:43 +03:00
Nihad Abbasov 43d2e7b104 add db index for authentication_token column in users table 2013-06-14 22:07:09 +05:00
Dmitriy Zaporozhets 48e5dff99c Fix MR feature 2013-06-14 19:58:16 +03:00
Dmitriy Zaporozhets 940c05086e Check for existing MR only for opened/reopened MR 2013-06-14 17:19:26 +03:00
Dmitriy Zaporozhets e7c930a55b Add imported boolean to project. Prevent shell from creating repo after it was imported 2013-06-14 16:30:48 +03:00
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
Sytse Sijbrandij f7ea649f4b Implement (style) suggestions. 2013-06-14 14:13:14 +02: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