home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 28bb65f363 Update repository head successively during project update 
It prevents situation when async worker slowly updates HEAD and we show
old branch as repository HEAD in project settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 19:34:56 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard 
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
 2013-12-16 14:39:14 +01:00
Dmitriy Zaporozhets 99490159e5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-16 14:52:42 +02:00
Dmitriy Zaporozhets 7060668e09 Fixed db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 14:52:04 +02:00
Jacob Vosmaer 911bf5f0ae Merge pull request #5645 from sajanp/enhancement/install-guide 
Reorder steps to install web server before running gitlab:check
 2013-12-16 04:47:14 -08:00
Dmitriy Zaporozhets f24e151414 Merge pull request #5617 from zeeZ/nginx-proxy 
Add X-Forwarded-For to nginx config
 2013-12-16 03:54:04 -08:00
Dmitriy Zaporozhets b7fc0e81ce Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_message 
Allow user to hide the message to add an ssh key permanently
 2013-12-16 03:25:00 -08:00
Dmitriy Zaporozhets d46dba5830 Merge pull request #5847 from skv-headless/fix_deprecation_warnings 
fix most of warnings
 2013-12-16 03:22:55 -08:00
Dmitriy Zaporozhets 4227f6ed14 Merge pull request #5856 from nishigori/fix-typo 
Fix messages typo
 2013-12-16 02:54:15 -08:00
Dmitriy Zaporozhets 3f709e0a97 Merge pull request #5848 from bke-drewb/feature/time_ago_tooltips 
Add time ago tooltips to show actual date/time
 2013-12-16 02:53:12 -08:00
Dmitriy Zaporozhets 3221dc5381 Merge pull request #5681 from chopmann/patch-2 
FIX: Browser back button breaks "Loading..." visual
 2013-12-16 02:51:23 -08:00
Takuya Nishigori e78b90ab1d Fix messages typo 2013-12-16 17:57:50 +09:00
J.M 3229311b0b Make sidebar links more accessible, display: block 2013-12-15 11:49:54 +01:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently 
Favor links instead of buttons

Remove unnecessary class

Remove extra space
 2013-12-14 20:21:12 -06:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time 
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
 2013-12-14 15:24:12 -06:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Dmitriy Zaporozhets d476ac7d41 Remove colored gem from upgrader script. pt2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-14 14:11:31 +02:00
Dmitriy Zaporozhets 5e73a3b124 Remove colored gem from upgrader script 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-14 14:10:24 +02:00
Drew Blessing 63723ef6df Fix dashboard event caching 2013-12-13 13:40:45 -06:00
Vikraman Choudhury 969a4a8f71 Add comment about tls for ldap method 
`omniauth-ldap` also supports tls for ldap method
 2013-12-13 22:16:58 +05:30
Dmitriy Zaporozhets ee53b73986 Merge branch 'feature/minor_update_script' of /home/git/repositories/gitlab/gitlabhq 2013-12-13 14:45:27 +00:00
Dmitriy Zaporozhets c638ef3348 Use 'ruby script/upgrade.rb -y' instead of ENV 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 16:23:58 +02:00
Dmitriy Zaporozhets 51c9f0fd76 Allow non-interactive run of upgrade script. ruby script/upgrade.rb FORCE=yes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 16:17:54 +02:00
Dmitriy Zaporozhets b1eb3d4670 Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq 2013-12-13 13:28:55 +00:00
Dmitriy Zaporozhets 99830bb6f8 Create branch for tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 15:22:27 +02:00
Dmitriy Zaporozhets 440f3f384f Minor version upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-13 15:18:57 +02:00
Dmitriy Zaporozhets 2ca4e70894 Show MR accept info only if merge request is open 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.0.pre3 		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 c959143ed7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-12-12 18:31:01 +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 144a25ef4d Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq 2013-12-12 14:30:05 +00: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 f381308c85 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-12 15:12:12 +02:00
Dmitriy Zaporozhets 03e517e077 Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhq 2013-12-12 13:10:04 +00:00
Dmitriy Zaporozhets 8c5aa5e3b1 Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 14:20:08 +02:00
Dmitriy Zaporozhets f1be13748b Merge pull request #5827 from Razer6/remove_rails4_travis 
Remove rails4 branch in travis configuration
 2013-12-12 02:28:44 -08: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
Robert Schilling 5675d34316 Remove rails4 branch in travis configuration since this branch is already merged 2013-12-12 10:46:49 +01: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 7bb2a536a0 Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 17:30:49 +00:00
Jacob Vosmaer 7cb75aeb46 Reduce Fog expiration period to 17 years 2013-12-11 17:40:11 +01:00
Jacob Vosmaer 3e57d88e57 Expire fog links after 34 years 2013-12-11 17:40:11 +01:00
Dmitriy Zaporozhets 38fc5dc2a8 Fix disappearing @ when mention user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-11 18:17:08 +02:00
Dmitriy Zaporozhets 0456c66628 Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 16:02:14 +00:00