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,481 Commits 48 Branches 340 Tags
3adf35fb642fd8acfa4ecc1bd73f06ddb8fa9849
Commit Graph
7481 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
skv 3adf35fb64 pluck user_ids during team import 2013-12-17 22:37:56 +04:00
Dmitriy Zaporozhets 26c8b31634 Merge branch 'contributing-enhancements' of /home/git/repositories/gitlab/gitlabhq 2013-12-17 14:35:37 +00:00
Dmitriy Zaporozhets 9c668133dc Add 6.4 entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 11:54:07 +02:00
Dmitriy Zaporozhets 26a5695e33 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 11:38:30 +02:00
dosire 49ad8f3b57 More hints for pull requests. 2013-12-17 09:37:53 +01:00
Dmitriy Zaporozhets 3d7edf0fe3 Merge pull request #5862 from jvanbaarsen/patch-1 
Fixed the no_avatar.png path
 2013-12-16 22:54:49 -08:00
Dmitriy Zaporozhets fe07c737aa Merge branch 'improve/devise_ui' of /home/git/repositories/gitlab/gitlabhq 2013-12-17 06:05:52 +00:00
Jeroen van Baarsen a9d1038f03 Fixed the no_avatar.png path 
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4394
 2013-12-16 21:56:45 +01:00
Dmitriy Zaporozhets dea02363d4 Merge branch 'feature/project_in_mr_emails' of /home/git/repositories/gitlab/gitlabhq 2013-12-16 19:30:52 +00:00
Dmitriy Zaporozhets 80c4657fa7 Merge branch 'improve/repo_head_update' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
 2013-12-16 21:30:24 +02:00
Dmitriy Zaporozhets 42003f5312 Improve UI/UX for reset_password, signup, confirmation pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:11:52 +02:00
Dmitriy Zaporozhets 6f556d8e71 Add resend-confirmation-link to sign-in page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:10:59 +02:00
Dmitriy Zaporozhets 687cf48e60 Improve email with confirmation instructions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:10:18 +02:00
Dmitriy Zaporozhets 84f9613775 Style devise error messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:09:15 +02:00
Dmitriy Zaporozhets f40ad6ce40 Merge pull request #5841 from Popl7/archiving_old_projects 
Archiving old projects for feature request
 2013-12-16 10:06:26 -08:00
Dmitriy Zaporozhets ca29617d54 Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates 
Fix dashboard event caching
 2013-12-16 10:03:52 -08:00
Dmitriy Zaporozhets 0429740af6 Add @project variable to merge request emails 
After this change project name appears in the top part of email when you
open/close/accept merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 19:56:47 +02:00
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
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
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