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
7,613 Commits 48 Branches 340 Tags
fcf55171c4d5a25bc08da37e704f95ca8ca4e06b
Commit Graph
7613 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets fcf55171c4 Merge branch 'skv-headless-privacy_label' 2013-12-26 13:31:14 +02:00
Dmitriy Zaporozhets 05de390fd8 Style project visibility icons on dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 13:31:02 +02:00
Dmitriy Zaporozhets fd6fc422c6 Merge branch 'privacy_label' of https://github.com/skv-headless/gitlabhq into skv-headless-privacy_label 2013-12-26 13:18:02 +02:00
Dmitriy Zaporozhets 7458437ed9 Improve sorting for public projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 11:24:43 +02:00
Dmitriy Zaporozhets 6a0c0f3f3f Add sorting to public projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 11:16:30 +02:00
Dmitriy Zaporozhets 8310b4589d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-26 10:52:50 +02:00
Dmitriy Zaporozhets 3df417b857 bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:51:52 +02:00
Dmitriy Zaporozhets 19c2c90cca Merge pull request #5928 from skv-headless/master 
Fix warnings
 2013-12-26 00:40:30 -08:00
Dmitriy Zaporozhets 7bf0add0d1 Merge branch 'refactor/notes' of /home/git/repositories/gitlab/gitlabhq 2013-12-26 08:23:08 +00:00
Dmitriy Zaporozhets 4cd7a56333 Add User#email uniq validation. Fixed confirmation for admin/users form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:20:36 +02:00
Dmitriy Zaporozhets a389d77769 Fix User#by_username_or_id for postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:09:15 +02:00
Dmitriy Zaporozhets 5f7db3e94b Fix file upload for edit note. Better style for discussion form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 09:44:18 +02:00
Dmitriy Zaporozhets d4ec23b8b5 fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 09:39:55 +02:00
skv aff37adb9e visibility level info in project tabs 2013-12-26 10:44:59 +04:00
Dmitriy Zaporozhets 21b028b548 Improve tests and make preview for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 23:21:26 +02:00
Dmitriy Zaporozhets 9305ef8940 Remove old methods and classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 22:33:40 +02:00
Dmitriy Zaporozhets f554aa38d5 Update commentable controllers with new note vars 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 22:32:48 +02:00
Dmitriy Zaporozhets 48c682b52f Switch Notes controller to use json 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 22:32:23 +02:00
Dmitriy Zaporozhets 923bd2ecd2 Write new Notes coffee class to handle comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 22:31:18 +02:00
skv a443a19862 fix warnings 2013-12-25 23:29:40 +04:00
Dmitriy Zaporozhets c797493e00 Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq 2013-12-25 12:49:27 +00:00
Dmitriy Zaporozhets f7e7dc7ebb Make note anchors actually work 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 13:32:43 +02:00
Marin Jankovski c447a2131d Enable secure option if https is used. 2013-12-25 12:30:33 +01:00
Dmitriy Zaporozhets 73af33e4b1 Improve FilterContext tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 12:45:54 +02:00
Dmitriy Zaporozhets 34f994b7c5 Improve dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:56:39 +02:00
Dmitriy Zaporozhets 1e64333c5f Refactor FilterContext 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:45:53 +02:00
Dmitriy Zaporozhets 1a2e11c891 Fix per-project counters for Dashboard filters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:19:51 +02:00
Dmitriy Zaporozhets f6a4e5636d Include scope in dashboard filters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:08:56 +02:00
Dmitriy Zaporozhets 16ea2ec189 Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 18:59:00 +00:00
Dmitriy Zaporozhets b1970e0cf1 Tests for Dashboard#issues filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 19:04:57 +02:00
Dmitriy Zaporozhets 4c61c46738 Add tests to Dashboard#merge_requests filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 18:22:48 +02:00
Dmitriy Zaporozhets a16d755813 Merge branch 'refactor/scss' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 15:21:25 +00:00
Dmitriy Zaporozhets 5953582b65 Show Assigned/Authored/All filter for dashboard issues and mr pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 14:53:52 +02:00
Dmitriy Zaporozhets 0c0beec26e use .body instaed of .ui-box-body 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 12:58:23 +02:00
Dmitriy Zaporozhets ce527b68f0 Merge branch 'improve/avatar_upload_only_images' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 10:53:56 +00:00
Dmitriy Zaporozhets ede3446c6f Merge branch 'confirmation_protection' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 10:53:18 +00:00
Dmitriy Zaporozhets dac67ed65f Use new ui-box classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 11:45:42 +02:00
Dmitriy Zaporozhets 4345e9220e Refactor UI boxes. Split issue box to different class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 11:45:28 +02:00
Marin Jankovski f537e4c963 Confirmation url throttle. 2013-12-24 10:11:33 +01:00
Dmitriy Zaporozhets 62f1c97720 Add User#avatar_type tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 10:55:45 +02:00
Dmitriy Zaporozhets dc5bd10d45 Merge pull request #5922 from jhollingsworth/fix/rake-routes 
Fixed issue with `bundle exec rake routes` not running.
 2013-12-23 23:49:29 -08:00
Jason Hollingsworth 405492e90c Fixed issue with bundle exec rake routes not running. 
Wrap regex comments in (?#comment) construct.
 2013-12-23 20:01:38 -06:00
Dmitriy Zaporozhets e6f83399f3 Dont allow upload of non-image formats for user avatar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 20:28:59 +02:00
Dmitriy Zaporozhets 055b3c4dd6 Mention that Upgrader works for 6.4.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 20:02:38 +02:00
Dmitriy Zaporozhets 84ec226356 No tabs, only 2 spaces 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 18:32:23 +02:00
Dmitriy Zaporozhets 1443d5102a Add 6.4.1 and 6.4.2 CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 18:29:10 +02:00
Dmitriy Zaporozhets 088f0602b9 Fix upgrader 
It created branch based on current branch which is an old version

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 18:01:51 +02:00
Dmitriy Zaporozhets 44b1eadf08 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-12-23 16:41:24 +02:00
Dmitriy Zaporozhets bfcaf4e543 GitLab Upgrader requires v6.4.0+ 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 16:41:06 +02:00
Dmitriy Zaporozhets a6cbeaca83 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-23 14:26:36 +02:00