home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2ca4e70894 Show MR accept info only if merge request is open 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 13:21:12 +02:00
Dmitriy Zaporozhets 4ec8eecb66 Fix header case 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 13:14:43 +02:00
Dmitriy Zaporozhets a7a344f042 Fix broken UI for admin system hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 13:12:54 +02:00
Dmitriy Zaporozhets 9b7b27ce72 Add authenticity_token: true to multipart forms 
Rails 4 does not generate token by default
It fixes bug when you get to sign-in page after trying to upload image
with comment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 19:05:21 +02:00
Dmitriy Zaporozhets 32e18169e8 Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 18:30:32 +02:00
Dmitriy Zaporozhets 29bfe34521 Fix emojii autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 15:31:37 +02:00
Dmitriy Zaporozhets cb599a09be Allow close of broken MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 12:20:54 +02:00
Dmitriy Zaporozhets 432018f84b Use MR#source_project_path method instead of merge_request.source_project.path_with_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:52:10 +02:00
Dmitriy Zaporozhets 7901d14315 Proper erro message for MR when fork removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:51:39 +02:00
Dmitriy Zaporozhets 6c3459978d Add new methods to MR to check if source or target branch exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:34:42 +02:00
Dmitriy Zaporozhets 5a4386a466 Render valid message when MR source or target branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:33:57 +02:00
Dmitriy Zaporozhets 405694a5d6 do not remove merge requests when fork project destroyed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:32:16 +02:00
Dmitriy Zaporozhets 0456c66628 Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 16:02:14 +00:00
Drew Blessing c26d392b1a Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
Dmitriy Zaporozhets 0cd2ea88b3 Dashboard avatars: No need to load 40px images if we render them in 24px 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-11 16:09:23 +02:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets 5289190ce8 Add require for Files contexts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 14:15:08 +02:00
Dmitriy Zaporozhets 6708a770de Even more data: confirm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:48:00 +02:00
Dmitriy Zaporozhets 74d6e492d3 More data: confirm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:46:50 +02:00
Dmitriy Zaporozhets f088c867a4 Fix signup for rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:35:10 +02:00
Dmitriy Zaporozhets 2ab76ca531 Fix UserProject obserse spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:24:48 +02:00
Dmitriy Zaporozhets d75eb24378 Fix more confirm deprecations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:20:54 +02:00
Dmitriy Zaporozhets 0124ae18c5 Fix User#by_username_or_id for postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:20:35 +02:00
Dmitriy Zaporozhets ed82ab4117 Remove some deprecations and fir project helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 7c91055e4a Fix wiki editing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 0f5f021527 Fix commits atom feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2293cb1051 Fixed some deprecations 
* Model.all is deprecacted, use without .all
* confirm: message is deprecated, needed to be wrapped
  in data block
 2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 77febe8f1e Fixed mistake and mock warning 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets f57a4dd922 Fixed rails 4 deprecation warnings in groups 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 70bb976bc6 Fixed the last deprecation warnings for order and where 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2a62aa45cd Fixed some deprecation warnings 2013-12-10 12:11:27 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets e5affcf1ee Fixed default scope deprecation warning 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 475fedc0a7 Make User#accessible_deploy_keys works in rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets b3c1d0d8df Added allow_blank to model validations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 16697f6efa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-10 12:09:18 +02:00
Dmitriy Zaporozhets 6a90378dae Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq 2013-12-10 10:02:57 +00:00
Dmitriy Zaporozhets 27900efb97 Merge pull request #5779 from jvanbaarsen/patch-1 
Better warning when deleting a user
 2013-12-10 01:47:35 -08:00
Dmitriy Zaporozhets a215dbe43a Use antialiased font-smoothing for webkit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 20:13:08 +02:00
Dmitriy Zaporozhets bc82b2f803 Merge branch 'feature/api_version_admin' of /home/git/repositories/gitlab/gitlabhq 2013-12-09 17:54:54 +00:00
Dmitriy Zaporozhets a7e1290a67 Merge branch 'bug/duplicates_in_search' of /home/git/repositories/gitlab/gitlabhq 2013-12-09 17:54:45 +00:00
Dmitriy Zaporozhets ccf2e48a2c Set noreply@HOSTNAME for reply_to field in all emails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 16:36:21 +02:00
Dmitriy Zaporozhets 954dd39861 Remove duplicate items from search autocomplete 
Old behaviour gave you duplicate entries if your project is public

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 16:26:43 +02:00
Dmitriy Zaporozhets d0637d63db Show GitLab API version on Admin#dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 16:00:06 +02:00
Jacob Vosmaer 1af65c96c9 Avoid duplicate group membership emails 2013-12-09 09:22:59 +01:00
dosire 1661777516 The comments make it hard to copy paste commands. If you paste the whole line it fails. 2013-12-09 09:02:35 +01:00
Dmitriy Zaporozhets 1dfd585f3e Show rails version in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-06 22:20:11 +02:00
Dmitriy Zaporozhets 97e05469e2 Remove colors from icon helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-06 22:14:55 +02:00
Jeroen van Baarsen 00d72e73c8 Better warning when deleting a user 
Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
 2013-12-06 20:11:14 +01:00
Dmitriy Zaporozhets 3b20c89005 Add visibility filter to Dashboard#projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 20:26:21 +02:00
Dmitriy Zaporozhets a767c13367 Merge pull request #5752 from jhollingsworth/fix/no-404-for-project 
Fix 404 on project page for unauthenticated user
 2013-12-05 07:16:45 -08:00