home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,820 Commits 48 Branches 340 Tags
cc1dd324643db07bdb29f3673995a8ad0dffa2df
Commit Graph
9820 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis cc1dd32464 Add pkgr.io to readme one-click installation methods 2014-05-24 20:05:02 +03:00
Dmitriy Zaporozhets ef933ae69b Even more tests fixed :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:41:13 +03:00
Dmitriy Zaporozhets bbc4b2be8d Fix help tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:26:15 +03:00
Dmitriy Zaporozhets 5a1429ae21 Fix branches tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:20:12 +03:00
Dmitriy Zaporozhets 1bb9aeb565 Fix specs. Fix note form reset after submit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:10:36 +03:00
Dmitriy Zaporozhets 7c6a58a756 Merge branch 'ui-improvements' into 'master' 
Comment UI improvements

* use tabs for preview/write comment form because its better UX
* fix paddings for comment form and unnecessary borders
* remove unused css/js
* cleanup messy comment form html
 2014-05-24 10:41:48 +00:00
Dmitriy Zaporozhets 50f3280e01 Remove unused css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 13:15:23 +03:00
Dmitriy Zaporozhets 5cfaf945cd Improve notes form UI/UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 13:06:44 +03:00
Dmitriy Zaporozhets 0853eebd1c Improve comments css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 11:11:45 +03:00
Dmitriy Zaporozhets cc28b21adc Add drag-n-drop to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 10:30:58 +03:00
Dmitriy Zaporozhets 3e1853c5a0 More stuff to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 16:09:54 +03:00
Dmitriy Zaporozhets 09fc3df901 Merge branch 'explain-setting' into 'master' 
Explain setting
 2014-05-23 13:07:15 +00:00
Dmitriy Zaporozhets a502a2b85b Merge branch 'missing-items-changelog' into 'master' 
Missing items changelog
 2014-05-23 13:06:48 +00:00
Dmitriy Zaporozhets de7d93e31f Merge branch 'branch-creation-flow' into 'master' 
Branch creation flow

To improve user experience with web editing I did next improvements:

* when create branch via ui - redirect to tree view so you start add/edit files
* when click on branch name - redirect to tree view instead of commits so you can immedialty add/edit files
 2014-05-23 13:06:32 +00:00
Dmitriy Zaporozhets d906f19c5b Merge branch 'move-protected-branches' into 'master' 
Move protected branches to Project settings page

Because all settings should be in one place
 2014-05-23 13:06:01 +00:00
Dmitriy Zaporozhets c8abf2234c Merge branch 'license-to-bv' into 'master' 
License to bv
 2014-05-23 13:05:26 +00:00
dosire 245c04c29a Change the license to B.V. 2014-05-23 15:01:02 +02:00
Dmitriy Zaporozhets a56e35e925 Merge branch 'api-branch-deletion' into 'master' 
Api branch deletion

Fixes #1127
 2014-05-23 12:51:09 +00:00
Dmitriy Zaporozhets d575ee3e90 Improve branch deletion via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 15:34:02 +03:00
dosire 7f84ba8662 Project visibility setting is missed by people sometimes. 2014-05-23 14:31:09 +02:00
Marin Jankovski 68942dbb3d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-05-23 14:07:57 +02:00
Marin Jankovski 6990f8a846 Replace jquery deprecated .live with .on 2014-05-23 14:07:42 +02:00
dosire 8efc80ef06 Add threaded emails to changelog. 2014-05-23 14:02:39 +02:00
Dmitriy Zaporozhets 66c9fa950b Merge branch 'merge-marshal' into 'master' 
Merge marshal
 2014-05-23 11:57:22 +00:00
Dmitriy Zaporozhets c1da50c1ff Merge branch 'remove-features-raketask' into 'master' 
Remove features raketask

As discussed

Fixes #1179
 2014-05-23 11:56:52 +00:00
Dmitriy Zaporozhets 484c09792c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:33:20 +03:00
Dmitriy Zaporozhets 695fd3cf2c Move protected branches to Project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:25:55 +03:00
Dmitriy Zaporozhets b44138ae40 Branch link on branches page goes to tree view instead of commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 13:29:14 +03:00
Dmitriy Zaporozhets a5e1624359 Redirect to tree view after branch created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 13:27:35 +03:00
Dmitriy Zaporozhets 8ae2d2152b Fix branch protection help doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 13:22:10 +03:00
Dmitriy Zaporozhets 8ec38c17e2 Mention changes to protected branches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 13:19:39 +03:00
Dmitriy Zaporozhets fc8616582b Merge pull request #7011 from erbunao/drag-and-drop_markdown 
Implements drag and drop upload of image in every markdown-area
 2014-05-23 12:24:39 +03:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets 696b9903f0 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 09:47:58 +03:00
Dmitriy Zaporozhets 9e6466c784 Merge branch 'api-remove-branch' into 'master' 
New rules for protected branches

This MR change permissions logic for branch removal. Changes listed below:

Before
* developer can remove branch with terminal but not in UI
* masters can remove any branch with UI even protected one
* force-push to protected branch is not allowed but remove is allowed

After
* none can force push or remove protected branches
* developers and masters can remove normal branches with console and UI
 2014-05-23 06:06:22 +00:00
Dmitriy Zaporozhets eee14a0c74 Merge branch 'fix-scroll-to' into 'master' 
Fix js error when use scroll to highlighted line
 2014-05-22 20:17:15 +00:00
Dmitriy Zaporozhets ebe2a34a6b Add missing feature flag to mr notes spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 22:44:32 +03:00
Dmitriy Zaporozhets b192aa5694 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 22:34:34 +03:00
Dmitriy Zaporozhets 9f2183f904 Merge pull request #7002 from olafmandel/user_avatar_in_relative_root 
Fix avatar URLs in JS-lists for relative_url_root
 2014-05-22 22:17:04 +03:00
Dmitriy Zaporozhets 94f8e801a5 Merge pull request #7005 from alankehoe/master 
Update message on the group dashboard page
 2014-05-22 22:16:12 +03:00
Dmitriy Zaporozhets 8bf7b62e81 First entries for 7.0 CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 20:40:25 +03:00
Dmitriy Zaporozhets 05bff8b680 Merge branch 'improved-edit-file-ui' into 'master' 
Improved edit file ui

* remove ugly borders
* replace small buttons with tabs
* add spinner while diff is loading
 2014-05-22 17:35:41 +00:00
Dmitriy Zaporozhets de8c43f6f6 Merge branch 'new-group-avatar' into 'master' 
Ability to upload avatar when create new group

Before this change you dont know you can upload avatar for group until you visit group edit page.

After this change you are able to upload avatar during group creation
 2014-05-22 17:35:14 +00:00
Dmitriy Zaporozhets babfc068ae Lets start 7.0 development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 20:34:03 +03:00
Dmitriy Zaporozhets b9d1fc2f3b Improve protected branch explanation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 18:31:22 +03:00
Dmitriy Zaporozhets 74079fe236 Fix scroll to highlighted line. Replace scrollTO js file with gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 18:19:50 +03:00
Marin Jankovski 3296fb9f3a Add missing lines in update guide. 2014-05-22 16:27:32 +02:00
dosire 114e67564d The 4.0 raketask is no longer needed and rebuilding of missing satellites is automatic. 2014-05-22 14:40:38 +02:00
Dmitriy Zaporozhets 36cac35b24 Dont allow remove of protected branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 15:38:47 +03:00
Dmitriy Zaporozhets a9d60b3b14 Api call to remove branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:39:50 +03:00