home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,796 Commits 48 Branches 340 Tags
7f84ba8662384cebf5574cbd2da5841aab2eac90
Commit Graph
9796 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
Dmitriy Zaporozhets 0455391add Improve branch-removal logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:39:09 +03:00
Dmitriy Zaporozhets e089b11b7a Add BranchesHelper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:38:48 +03:00
Dmitriy Zaporozhets 88781783dd Delete branch service with permission checks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:23:20 +03:00
Dmitriy Zaporozhets 1ad174fbcd Improve edit page UI/UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 12:25:44 +03:00
Marin Jankovski 38d0e001ea Version to 6.9.0 2014-05-22 11:09:00 +02:00
Marin Jankovski dc7158a0f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-05-22 11:06:59 +02:00
Marin Jankovski b019c06195 Required shell version is now 1.9.4. 2014-05-22 11:01:01 +02:00
Sytse Sijbrandij 66dfe37d41 Merge branch 'grammar_fixes' into 'master' 
Grammar fixes

fixed typos in groups messages
 2014-05-22 08:50:42 +00:00
Marc Radulescu f5147780ff Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixes 2014-05-22 10:35:13 +02:00
Marc Radulescu d1980adf93 typos fixed 2014-05-22 10:35:01 +02:00
Sytse Sijbrandij 9f80ab8e75 Merge branch 'dev-setup-on-metal' into 'master' 
Dev setup on metal
 2014-05-21 11:06:40 +00:00
dosire 60053e6e2c It now is a metal dev install. 2014-05-21 13:06:12 +02:00
Dmitriy Zaporozhets f420ae4b18 Merge branch 'cloud-com' into 'master' 
Cloud com
 2014-05-21 10:02:19 +00:00
Alan Kehoe b08fe47fe8 Update message on the group dashboard page 2014-05-20 22:03:34 +01:00
dosire 13761caead Fixed spelling mistake in readme with a whole room watching. 2014-05-20 20:51:35 +02:00
Jacob Vosmaer 3199ef079c Merge branch 'deploy-key-projects' into 'master' 
Deploy key in multiple projects

Add doc on adding a deploy key easily to multiple projects through the API.
 2014-05-20 16:19:09 +00:00
Dmitriy Zaporozhets d52a3281dc Merge branch 'small-ui-improvements' into 'master' 
Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
 2014-05-20 15:44:45 +00:00
Dmitriy Zaporozhets ac46130748 Allow set group avatar when create group. Not only edit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:36:51 +03:00
Dmitriy Zaporozhets 2e8f4bf392 Merge branch 'milestome-ui' into 'master' 
Improve Milestome UI

Milestone UI header was different from Issue/MR pages but use same UI elements.
This MR fixes it so UI looks same for issue/mr/milestone
 2014-05-20 13:30:42 +00:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:22:47 +03:00
Olaf Mandel c18e2778b2 Fix avatar URLs in JS-lists for relative_url_root 
In user lists created when entering a (partial) user name into
a field, the URL to the user avatar was invalid if running with
relative_url_root.

This patch is the result of:
sed -i 's/\(= *\)\(user\.avatar_url\)/\1gon.relative_url_root + \2/' \
    app/assets/javascripts/*.coffee
 2014-05-20 15:22:23 +02:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:21:30 +03:00
dosire ce8e7d280b Change cloud into .com 2014-05-20 14:30:25 +02:00
dosire 0660183cb0 Renamed based on suggestion Martijn. 2014-05-20 13:29:52 +02:00