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
9,919 Commits 48 Branches 340 Tags
0e4bc4e6deafe90fc1632f9abbfb20c8206ea444
Commit Graph
5027 Commits
Author SHA1 Message Date
Marin Jankovski f79a300417 Replace existing links to help pages with the new ones. 2014-05-29 08:58:15 +02:00
Marin Jankovski a9580a157a Use the correct links, replace in search. 2014-05-29 08:44:25 +02:00
Marin Jankovski 59797b2f2e Remove list items styling in show render. 2014-05-29 08:44:25 +02:00
Marin Jankovski 54ff9d90ad Scan the text and add the help path. 2014-05-29 08:44:25 +02:00
Job van der VoortandMarin Jankovski fd476cf620 render items from doc 2014-05-29 08:44:25 +02:00
Job van der VoortandMarin Jankovski e61e3eaadb render readme in help 2014-05-29 08:44:25 +02:00
Dmitriy Zaporozhets 13cbc82aa1 Merge branch 'master-create-group-projects' into 'master' 
Master can create group projects

It also includes Project transfer refactoring

Fixes #1284
 2014-05-28 17:12:28 +00:00
Dmitriy Zaporozhets 64b1956b0b Merge pull request #7032 from erbunao/markdown_clipboard 
Implements clipboard feature for markdown areas.
 2014-05-28 19:54:44 +03:00
Dmitriy Zaporozhets 1932f902d5 Allow masters to create projects in groups 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:04:42 +03:00
Dmitriy Zaporozhets 900d30798b Use new Projects::TransferService class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:45 +03:00
Dmitriy Zaporozhets aea79b8035 Add ability rule for creating project in namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:01 +03:00
Dmitriy Zaporozhets aca6be50d3 Refactor project transfer service. Add security check when create or transfer project into group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:02:26 +03:00
erbunao 2273234653 Implements and refactors clipboard feature for markdown. 2014-05-28 22:51:47 +08:00
Dmitriy Zaporozhets a3db7631b8 Fix haml indent 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 12:52:02 +03:00
Dmitriy Zaporozhets a18ae13e98 Backport CI service refactoring from EE 
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 11:35:43 +03:00
Dmitriy Zaporozhets affd376f7a Dont show remove source branch ckecbox/button if you dont have such 
permissions for MR page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 18:51:41 +03:00
Dmitriy Zaporozhets d7b3bbfc4a Make MR dicussion and changes tabs more noticable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 12:06:31 +03:00
Dmitriy Zaporozhets e918ae240e Merge branch 'no_link_inside_code_block' into 'master' 
No link inside code block
 2014-05-27 06:26:22 +00:00
Dmitriy Zaporozhets c456231690 Use css truncation on dashboard 2014-05-26 23:26:41 +03:00
Marin Jankovski 603e04bc21 Make sure slashes are handled properly. 2014-05-26 20:43:58 +02:00
Marin Jankovski 52c3179be9 Do not replace links inside code blocks, less code for the same amount of work. 2014-05-26 20:43:58 +02:00
Marin Jankovski 3b2b3cff04 Move logic to image_service. 2014-05-26 14:54:03 +02:00
Marin Jankovski 8bec6b0bcb Make existing tests test something, return correct errors. 2014-05-26 14:17:46 +02: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 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 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 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
Marin Jankovski 6990f8a846 Replace jquery deprecated .live with .on 2014-05-23 14:07:42 +02: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
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08: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 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 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 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
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
Marc Radulescu f5147780ff Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixes 2014-05-22 10:35:13 +02:00