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
12,032 Commits 48 Branches 340 Tags
216fb6ee07b80c2cb6cd78fdcb52c898fa2f41ea
Commit Graph
1336 Commits
Author SHA1 Message Date
Marin Jankovski 2017977214 Use only webhook for slack service integration. 2014-10-06 10:44:01 +02:00
Vinnie Okada 088987e2dd Make Mentionables work for cross-project refs 
Add a note to merge requests and issues when they're mentioned by a
merge request, issue, or commit in another project.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 2c46c4523f Track projects in ReferenceExtractor 
Store both the project and identifier of extracted references.  This
prevents `ReferenceExtractor` from returning objects in the wrong
project for cross-project references.
 2014-10-03 12:30:20 -05:00
Sullivan SENECHAL d1fa3b336d Add Pushover service integration 
That introduce select field type for services options.
 2014-10-03 13:54:37 +02:00
Dmitriy Zaporozhets ac6f032122 Merge pull request #7779 from Bugagazavr/hook_tag_push_events 
Add tag push events to project hook api
 2014-10-03 13:38:56 +03:00
Dmitriy Zaporozhets 03b44916ba Merge pull request #7754 from Bugagazavr/hooks 
More information in merge request hook
 2014-10-03 13:37:19 +03:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev b4963e9dda Add tag_push_events to project hook api 2014-10-03 10:23:32 +04:00
Dmitriy Zaporozhets 8e33f9460c Show test coverage results in MR if available 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 18:17:47 +03:00
Dmitriy Zaporozhets c6f3f9bb33 Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_form.html.haml
 2014-10-02 12:50:29 +03:00
Kirill Zaitsev 1c9d2e39c1 Hook attributes 2014-10-02 12:58:02 +04:00
Dmitriy Zaporozhets adc84bf8b4 Merge pull request #7906 from mr-vinn/fix-graph-log 
Replace Gitlab::Git::GitStats
 2014-09-30 12:19:05 +03:00
Dmitriy Zaporozhets e145f46a93 Fix contributors api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:56:48 +03:00
Vinnie Okada 31abf76840 Replace Gitlab::Git::GitStats 
The `GitStats` class has been removed from gitlab_git, so parse commits
directly in `Repository#graph_log`.
 2014-09-29 22:58:21 -05:00
Jacob Vosmaer 51f8352dca Keep tmp/repositories during clean-up 2014-09-29 17:02:45 +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 44bc5fe5d6 Improve commits data loading on Tree page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 14:40:36 +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 16d530b7b0 Sort projects in search autocomplete by amount of stars. Most popular go first 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:41:49 +03:00
Dmitriy Zaporozhets 3a106cbcd3 Fix graphs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:06:41 +03:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets b13c1469a3 Rollback diff drop and set default commit id to HEAD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:46:30 +03:00
Dmitriy Zaporozhets 3695ae185b Decorate commit parents 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:19:26 +03:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets a5d23ae3c8 Fix MR commenting system when new commits pushed 
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
 2014-09-23 14:20:21 +03:00
Ciro Santilli 705fe01dca Factor issue and edit MR form label field and submit. 2014-09-22 21:24:25 +02:00
jubianchi 998cd3cb63 Improve error reporting on users API 
* users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
 2014-09-16 01:25:24 +02:00
Dmitriy Zaporozhets 38ed0deaac Move hook models in separate dir 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:31:30 +03:00
Dmitriy Zaporozhets 39ab7527d4 Fix project member management 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:04:25 +03: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 13af7de941 Fix migration and association for new members table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 20:38:57 +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
Dmitriy Zaporozhets eb4a9bfbca Add STI to Member model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 18:09:33 +03:00
Dmitriy Zaporozhets 757426dbb1 Add Member AR model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:54:10 +03:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Drew Blessing 09cdd94322 Fix serialize migration. Fixes #7734 2014-09-11 18:41:03 -05:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 6135eb0adf Merge pull request #7705 from dblessing/serialize_service_properties 
Serialize service properties
 2014-09-10 20:47:47 +03:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05: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 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
Dmitriy Zaporozhets f42a1ded99 Merge pull request #7696 from Zyphrax/master 
Prevent graph spacing issue
 2014-09-07 09:49:48 +03:00
Yvo van Beek 1f355279d2 Remove parent spacing. Fixes #7505 2014-09-06 19:51:28 +10:00
Dmitriy Zaporozhets fd6b7b4a30 Pluralize commit text for note when push to existing MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 17:27:53 +03:00
Dmitriy Zaporozhets b0b05aa28d Add comment to merge request when new push happens 
It allows track when user added new commits to existing merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 16:56:36 +03: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