home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,916 Commits 48 Branches 340 Tags
522d754dfee9673befc7e6dc93c8a080eba7ae66
Commit Graph
1303 Commits
Author SHA1 Message Date
Ciro Santilli 0f12e051c0 Remove statement without effect. 2014-09-30 17:53:54 +02:00
Dmitriy Zaporozhets 88b1e0ffcd Faster branch contains detection for commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:40:13 +03:00
Dmitriy Zaporozhets 3a8cd1fa59 Refactor commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:05:17 +03:00
Dmitriy Zaporozhets 6d0ddf45ba Raw implementation of commits stats page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 20:32:44 +03:00
Dmitriy Zaporozhets 20e0c9b132 Rewrite graphs feature 
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:04:41 +03:00
Dmitriy Zaporozhets 810028f3f3 Dont show blocked users in assignee filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:05:27 +03:00
Dmitriy Zaporozhets 3a72af480d Merge branch 'use-more-rugged' into 'master' 
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
 2014-09-25 13:58:20 +00:00
Dmitriy Zaporozhets 619c81b488 Fix Commit stats and diff encoding issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:26:35 +03:00
Dmitriy Zaporozhets 184e0f8df1 Fix non-showing error message when edit file via web 2014-09-24 19:15:37 +03:00
Dmitriy Zaporozhets db12e2dc8d Merge pull request #7807 from cirosantilli/factor-service-error 
Factor error and success methods from services.
 2014-09-22 21:00:11 +03:00
Ciro Santilli ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets 1aa48174db Fix STI+polymorphic for Group <-> GroupMember 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Dmitriy Zaporozhets 17fd28468e Merge branch 'project-destroy-redirect' into 'master' 
Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
 2014-09-11 06:45:52 +00:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Ralf Seidler 23241c181c Fixed houndci complaining over too long lines 2014-09-06 11:46:14 +02:00
Kevin Boyd 893bd8acec Incorporating Dmitriy's referrer-based routing suggestion 2014-09-05 22:35:46 +00:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Dmitriy Zaporozhets 60a98584f6 Merge pull request #7658 from Razer6/refresh_labels_page_on_delete 
Show labels help message if last label is deleted
 2014-09-05 14:39:40 +03:00
Ralf Seidler d93b046c4c Added search wiki feature 2014-09-05 13:36:43 +02:00
Robert Schilling bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02:00
Kevin Boyd 75b0ef82ba Fine-tune the Remove Project redirect. Now it redirects to admin_projects_path and shows a flash message confirming the action has been taken. 2014-08-29 15:56:26 -07:00
Charles Bushong 4cca1b050a Adding in snippet search functionality 
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
 2014-08-29 15:32:07 -04:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets 6f154c07c8 Prevent possible XSS issues by seting text/plain for all text files in 
RAW feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 10:42:52 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets ede08dbdd7 Implement search page with filtering of results and pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 09:57:50 +03:00
Jeroen van Baarsen 1b14864549 Set charset encoding to UTF-8 for snippets 
Fixes #2678

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-08-16 14:58:53 +02:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master' 
Remove labels via ajax

See merge request !1019
 2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:47:03 +03:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Dmitriy Zaporozhets 7122a823f8 Merge pull request #7393 from Razer6/fix_500_hook_service_down 
Prevent 500 if hook url is down when testing a hook, fixes #7376
 2014-08-11 12:41:35 +03:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets 2ecc79507a Order labels by name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 19:13:35 +03:00
Dmitriy Zaporozhets 86f1f8335f Merge branch 'epic/refactor-labels' into 'master' 
Epic/refactor labels

Part of #1385

See merge request !1003
 2014-07-30 15:02:49 +00:00
Dmitriy Zaporozhets 593df8e69a Improve labels 
* allow developers to manage labels
* add ability to remove label

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 15:15:39 +03:00
Dmitriy Zaporozhets 048a21974e Add create/update to Labels controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 13:12:11 +03:00
Dmitriy Zaporozhets b2a6f4e136 Refactor label rendering and default label set generation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 22:19:47 +03:00