home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,574 Commits 48 Branches 340 Tags
ede3446c6f0e046febd99fffbcbcda250afccec4
Commit Graph
7574 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets ede3446c6f Merge branch 'confirmation_protection' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 10:53:18 +00:00
Marin Jankovski f537e4c963 Confirmation url throttle. 2013-12-24 10:11:33 +01: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 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
Dmitriy Zaporozhets 1231a3678a Dont allow change of MR target or source projects after it was created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 09:48:43 +02:00
Dmitriy Zaporozhets e64c3b2b5c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 08:56:39 +02:00
Matthias Link 5c17be3604 Admin/Background Jobs: fixed spelling mistake 2013-12-19 20:42:11 +01:00
Dmitriy Zaporozhets 9728ae854e Fix broadcast message factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 21:06:59 +02:00
Dmitriy Zaporozhets d1aff25ca4 Consistent place for state-label across issues, mr, milestones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 21:00:44 +02:00
Dmitriy Zaporozhets 3cdb8f26c9 UI: use different padding in labels for Issues#show and Issues#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:25:01 +02:00
Dmitriy Zaporozhets 63d5fcc868 UI: allign milestone to right for issue, mr show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:21:22 +02:00
Dmitriy Zaporozhets d1e8495890 Add validations to BroadcastMessage color and font 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:11:01 +02:00
Dmitriy Zaporozhets e78c51f7cf Move broadcast colors CHANGELOG to 6.5 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:59:19 +02:00
Dmitriy Zaporozhets aef944ba7f Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev 2013-12-19 19:58:40 +02:00
Dmitriy Zaporozhets 3958330edc Added milestone_options and assigne_options helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:54:57 +02:00
Dmitriy Zaporozhets 5c68f4f4e5 remove unecessary bold text on Issue#show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:39:58 +02:00
Dmitriy Zaporozhets 1616dfdc07 UI improvements to issue show page 
* labels moved below the issue
* removed margin in "created by..." area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:36:27 +02:00
Dmitriy Zaporozhets 5405f19bac Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev 2013-12-19 19:15:19 +02:00
Dmitriy Zaporozhets 8bcb2ff27e Merge pull request #5865 from skv-headless/master 
pluck user_ids during team import
 2013-12-19 08:56:51 -08:00
Dmitriy Zaporozhets 33feaa0428 Merge pull request #5881 from gendoc/master 
More issues and merge request events support in Project web hooks
 2013-12-19 08:56:09 -08:00
Dmitriy Zaporozhets dc4b7cb49a More visible title for Issues, MR etc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 18:54:07 +02:00