home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,591 Commits 48 Branches 340 Tags
f7e7dc7ebbdac2a45d528d1f9c19055febd0bede
Commit Graph
7591 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets cdd7be01bd Merge pull request #5851 from mynetx/sidebar-links-display-block 
Make sidebar links more accessible, display: block
 2013-12-23 04:23:46 -08:00
Dmitriy Zaporozhets 6498ede083 Merge branch 'bug/broken_project_transfer' of /home/git/repositories/gitlab/gitlabhq 2013-12-23 12:17:57 +00:00
Dmitriy Zaporozhets 3af0fe3efb Merge branch 'bug/broken_path_change' of /home/git/repositories/gitlab/gitlabhq 2013-12-23 12:17:44 +00:00
Dmitriy Zaporozhets cc0d550f47 Add docs for upgrader script 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 14:15:22 +02:00
Dmitriy Zaporozhets 7765777583 Fix project transfer feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:24:10 +02:00
Dmitriy Zaporozhets b8b8a34b52 Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 13:19:13 +02:00
Dmitriy Zaporozhets 25d793eac5 Merge pull request #5900 from dprolife/patch-1 
Fix 'uninitialized constant Unicorn' error
 2013-12-22 08:48:57 -08:00
dprolife 6b2ee67269 Fix 'uninitialized constant Unicorn' error 2013-12-22 11:08:43 +01:00
Dmitriy Zaporozhets 854977a201 Merge pull request #5883 from matthee/master 
Admin/Background Jobs: fixed spelling mistake
 2013-12-22 00:53:20 -08:00
Dmitriy Zaporozhets 2008361b8e Merge pull request #5889 from skv-headless/master 
coffee interpolation for template of user select
 2013-12-22 00:53:04 -08:00
Dmitriy Zaporozhets b09b9480ce Merge pull request #5894 from patschi/patch-1 
Add command for updating the init.d script
 2013-12-22 00:51:18 -08:00
Patschi 487f7551df Add command for updating the init.d script 2013-12-21 23:05:44 +01:00
Dmitriy Zaporozhets f23ffeece7 Merge branch '6-5-dev' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
 2013-12-21 23:23:59 +02:00
Dmitriy Zaporozhets 68118b5446 Version to 6.5.0.pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-21 23:23:13 +02:00
Dmitriy Zaporozhets 59c5a42e96 Merge pull request #5888 from jameswritescode/passenger_fix 
Don't use unicorn worker killer if using Phusion Passenger
 2013-12-20 13:49:10 -08:00
skv ae3cb2d6ce coffee interpolation for template of user select 2013-12-20 21:31:45 +04:00
James Newton 756258ab1d don't use unicorn worker killer if PhusionPassenger is defined 2013-12-20 10:30:34 -06:00
Dmitriy Zaporozhets 0e4a8e231c Version 6.4.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.0 		2013-12-20 16:03:05 +02:00
Dmitriy Zaporozhets 1dab27ee37 Update guide for 6.3 to 6.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 16:02:26 +02:00
Dmitriy Zaporozhets be3e1ccb9d Point ot 6-4-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 16:02:06 +02:00
Dmitriy Zaporozhets 6d3bb508f5 Merge branch 'bug/mr_iids_duplicate' of /home/git/repositories/gitlab/gitlabhq 2013-12-20 10:31:27 +00:00
Dmitriy Zaporozhets a849676300 Use relative dates with tooltips fopr Issue#show and MR#show 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 10:03:29 +02:00