home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
470 Commits
Author SHA1 Message Date
skv 20b2102771 notes count in 1 query for mr and commits 2014-06-10 16:10:53 +04:00
Loic Nageleisen c1ccc3a57b Added ability to serve files in wiki repository 
From #6168.
 2014-06-07 11:14:33 +02:00
Dmitriy Zaporozhets f1ec62f465 Add reopened tab to milestone issues. Add ids and data to milestone issues to enable dragging 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:52:35 +03:00
Dmitriy Zaporozhets 4e249dadb5 Fix 500 error when generate labels on labels page. Fixes #1311 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:08:21 +03:00
Dmitriy Zaporozhets e569cf369a Merge pull request #6991 from jvanbaarsen/branch-counter-after-delete 
Make sure the branch counter gets updated
 2014-05-29 15:39:46 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Sean Edge 2d4ba2679a Update tags_controller.rb to use CreateTagService. 2014-05-28 07:59:02 -04: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
Jeroen van Baarsen 4ac56fa1db Changed some stuff around after rebase 2014-05-23 20:26:31 +02:00
Jeroen van Baarsen d0e794cc1a Make sure the branch counter gets updated 
When you delete a branch, the counters wont get updated automaticly,
this happends because of the JS nature of the original call. I've
fixed this by responding with a JS file, and recalculate the counters.

Fixes: #6030
 2014-05-23 20:23:59 +02: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 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 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 0455391add Improve branch-removal logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:39:09 +03:00
Andrey Vasilyev 36a5bbcc8f Fixes a problem with 'Issues' filter box, where description of the filter says 'Filter by title or description' but in fact filter only works for title and doesn't work for description 2014-05-16 09:42:58 +04:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 8eae01ea58 Compare branches in MergeRequestsController#new action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:38:52 +03:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master' 
Add support to show files from wiki repository on wiki pages
 2014-05-06 10:21:05 +00:00
Marin Jankovski 4146e885dd Fix styling issues. 2014-05-05 11:55:49 +02:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Jacob Vosmaer 285926918b Serialize last_fetched_at as a string with seconds 2014-04-28 12:42:01 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Marin Jankovski 0050c07fdd Serve a file if in wiki. 2014-04-24 15:00:18 +02:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets 9c7a9d92ff Merge pull request #6773 from tsigo/rs-tag-page-sorting 
Use VersionSorter on the Project > Tags page
 2014-04-15 09:30:39 +03:00
Robert Speicher c803e78fd0 Use VersionSorter on the Project > Tags page 2014-04-14 12:40:27 -04:00
Dmitriy Zaporozhets 448e5c133a Merge branch 'satellite_exists_in_automerge_check' into 'master' 
Satellite exists in automerge check
 2014-04-14 13:21:49 +00:00
Marin Jankovski aa6426f46d Satellite will exist when doing automerge_check. 2014-04-11 10:22:32 +02:00
Marin Jankovski 872482678b Speed up loading and add pagination to wiki pages page. 2014-04-11 10:02:52 +02:00
Dmitriy Zaporozhets 4e9add7c2c Merge branch 'clean_old_archives' into 'master' 
Clean old archives from repository downloads directory
 2014-04-09 17:50:09 +00:00
Marin Jankovski b2959c4102 Remove archives older than 2 hours. 2014-04-09 15:09:11 +02:00
Dmitriy Zaporozhets b27c42be87 Rename wiki variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:01 +03:00
Dmitriy Zaporozhets d238a21bcb Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook 
Fix url generation error on hook invalid create
 2014-04-07 19:55:09 +03:00
Dmitriy Zaporozhets d92e4830f7 Allow people to remove source branch of fork project in MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 19:11:02 +03:00
skv 4cc2afdf2e Fix url generation error on hook invalid create 2014-04-06 19:42:24 +04:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service. 
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:38:35 +03:00
Dmitriy Zaporozhets 95b84e2c5a Move branch creation logic in service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-01 10:33:23 +03:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets f08464c055 Remove author_id_of_changes from app 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:01:52 +02:00
Dmitriy Zaporozhets 36b065e634 Feature: reopen closed merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:43:16 +02:00
Dmitriy Zaporozhets a9280de11f Better redirect for edit blod from MergeRequest 
If you cancel edit you will be redirected back to merge request
If you submit changes you will be redirected back to merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 14:06:31 +02:00
Dmitriy Zaporozhets 5d6e4bd2d8 Fix gitlab ci widget for forks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 13:18:27 +02:00
Dmitriy Zaporozhets 1ff1b6d816 Merge pull request #5719 from jacob-carlborg/mr_target 
By default, target original repository if it's a fork when creating new MR.
 2014-02-26 12:33:48 +02:00
Dmitriy Zaporozhets 645e8d4705 Move services for collecting items to Finders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 19:15:08 +02:00