home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,598 Commits 48 Branches 340 Tags
cb4d8eff4cb158fbef4d59bf64e04e776e29eaed
Commit Graph
197 Commits
Author SHA1 Message Date
ahmyi 4d051e987f Archive with content-length header 2014-07-03 11:05:51 +08:00
ahmyi dce6cb2d84 Content-length defined in header response 
Enable Content-Length to be defined in header response
 2014-07-03 10:57:01 +08:00
Marin Jankovski 751d267f29 Create required issue param for new action. 2014-07-01 14:03:49 +02:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets 2acde87e0d Project hook, milestone, snippet strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:51:11 +03:00
Dmitriy Zaporozhets e382c8dfc7 team member and hook strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:45:33 +03:00
Dmitriy Zaporozhets f86afb732b Fix dev env. Fix MR creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:40:13 +03:00
Dmitriy Zaporozhets 16a0a4aecc Note strong_params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 16:49:22 +03:00
Dmitriy Zaporozhets 3a21c904dd Use strong params for 5 more models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 15:00:09 +03:00
Dmitriy Zaporozhets 04516027df Project services to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:49:09 +03:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets 3900eee30e Increase commit log amount for tree view from 10 to 25 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:29:39 +03:00
Dmitriy Zaporozhets 907548a0fb dont render discussion diff unless note is for diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 10:14:35 +03:00
Dmitriy Zaporozhets 30912c75b8 Improve merge request comments 
When add diff note on 'Changes' page - and then go to 'Discussions' tab
you will not see this discussion unless you reload a page. This commit
fixes it by rendering discussion on 'Discussion' page as soon as you
submit comment on 'Changes' page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 14:57:59 +03:00
Dmitriy Zaporozhets 094e5efb4c Merge pull request #6992 from skv-headless/project_commits_sql_optimization 
notes count in 1 query  for mr and commits
 2014-06-24 10:38:50 +03:00
Dmitriy Zaporozhets d52df8e730 Merge branch 'issues-filter-by-description' into 'master' 
Issues filter by description

In Issues section of any project there is a filter box, which by default says 'Filter by title or description' - so this behaviour is desired. But in fact only filter by title works and filter by description DOESN'T work. This fix adds description fitlering.
 2014-06-24 07:04:01 +00:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets 8d240fb0e7 Show/hide issue assignee avatar depends on drag-n-drop column in milestone view 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 12:17:34 +03:00
Dmitriy Zaporozhets 054d68a3e9 Improve MR message for huge diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:58:08 +03:00
Dmitriy Zaporozhets 5fdcaadf34 Merge branch 'fix-new-mr-502' into 'master' 
Fix 502 error on new merge request page

When diff is huge we try to render it that cause 502 error often.
After this patch we apply soft limits to diffs. So if diff is huge - we doing show it

Fixes #1323
 2014-06-13 13:15:41 +00:00
Dmitriy Zaporozhets 59e1819561 Apply soft diff limits to MergeRequest#new page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:00:35 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets 98416ec9ab Show proper message for new MR when satellite fails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:49:45 +03:00
Dmitriy Zaporozhets fcb0b76c32 Load last commit for files per 10 items. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 12:01:54 +03:00
Dmitriy Zaporozhets e740a00ed6 Prevent commit page error if cant collect branches where commit exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:08:39 +03:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets dd86ce3f06 Sort issues in milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 14:09:45 +03:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
skv 20b2102771 notes count in 1 query for mr and commits 2014-06-10 16:10:53 +04: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