home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,916 Commits 48 Branches 340 Tags
522d754dfee9673befc7e6dc93c8a080eba7ae66
Commit Graph
1607 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 522d754dfe Try wear_merged! without argument 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 11:43:16 +03:00
Marin Jankovski f7aba277e7 Add option to gitlab config to specify if LDAP server is active directory. 2014-09-30 12:07:31 +02:00
Dmitriy Zaporozhets 4c52ff5184 Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-09-30 12:17:57 +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
Robert Schilling 57c0d9ec46 Merge pull request #7870 from mr-vinn/fix-notify-spec 
Update expected value in notify_spec
 2014-09-30 07:53:46 +02:00
Dmitriy Zaporozhets efcac2befc Merge pull request #7873 from cirosantilli/testme-to-gitlabtest 
Replace testme with gitlab-test.
 2014-09-29 19:49:59 +03:00
Dmitriy Zaporozhets 804b25956e Merge branch 'protect_default_branch_by_default' into 'master' 
Protect default branch by default

Fixes #1543

See merge request !1130
 2014-09-29 15:16:15 +00:00
Marin Jankovski ab6459ad48 Add a simple spec test. 2014-09-29 16:07:53 +02:00
Dmitriy Zaporozhets 36d7e18f4a Add specs for Repository#last_commit_for_path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 16:45:16 +03: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
Ciro Santilli b49dd2c573 Replace testme with gitlab-test. 2014-09-27 10:11:20 +02:00
jubianchi f258a59ef6 Filters issues by milestone via API 2014-09-26 22:03:37 +02:00
Vinnie Okada 97e2f8a0d9 Update expected value in notify_spec 
Prevent test failures when Gitlab is configured to use a port other than
80.
 2014-09-26 14:55:45 -05:00
Dmitriy Zaporozhets fd338d6715 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-26 12:58:20 +03:00
Dmitriy Zaporozhets 9ecd3bc6ce Improve git_push service specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 12:55:57 +03:00
Ciro Santilli 89f7345f3f Remove unnecessary page. from tests. 2014-09-26 09:51:17 +02:00
Dmitriy Zaporozhets eaeb4a90d4 Fix branch API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:22:08 +03:00
Dmitriy Zaporozhets 3bf316dbd9 Fix security tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:10:03 +03:00
Dmitriy Zaporozhets 28b6f09fcc Merge pull request #7823 from cirosantilli/test-fetch-shell 
Only clone GitLab Shell on tests if necessary.
 2014-09-24 12:58:10 +03:00
Dmitriy Zaporozhets 4d5435410f Merge branch 'jubianchi-api/improve-error-reporting' into 'master' 
Merge jubianchi-api/improve-error-reporting

Closes https://github.com/gitlabhq/gitlabhq/pull/7502

See merge request !1112
 2014-09-24 09:25:55 +00:00
Dmitriy Zaporozhets 15ba6ea105 Refactor Gitlab::GitAccess tests 2014-09-24 12:04:40 +03:00
Dmitriy Zaporozhets 3aa7132adc Add GitAccess specs 2014-09-24 11:37:30 +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 6e328d5590 Merge pull request #7793 from cirosantilli/replace-javascript 
Replace javascript:; links with buttons.
 2014-09-23 21:28:35 +03:00
Marin Jankovski 80b58184d3 Merge branch 'fix-mr-commit-comment' into 'master' 
Fix MR commenting system when new commits pushed

Fixes #1608

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`

See merge request !1108
 2014-09-23 15:10:28 +00: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
Jacob Vosmaer d5c81a8d4a Merge pull request #7692 from mr-vinn/fix-spec-rm 
Use FileUtils to delete instead of File
 2014-09-23 11:23:47 +02:00
Ciro Santilli 065ab3e5f3 Only clone GitLab Shell on tests if necessary. 2014-09-22 21:37:52 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Vinnie Okada 8ec602e64f Fix invalid method in test 
Use FileUtils::rm_f to delete the satellite lock file.
 2014-09-22 11:50:27 -05:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-20 11:55:58 +03:00
Dmitriy Zaporozhets fe314d460e Refactor coverage tools usage 
rspec spec # no coverage generated
SIMPLECOV=true rspec spec # generate coverage locally into ./coverage
COVERALLS=true rspec spec # generate and send coverage data to coveralls.io

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 16:39:56 +03:00
Dmitriy Zaporozhets aca574d0f4 Ask coveralls to merge results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 13:07:58 +03:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03: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 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03:00
Marin Jankovski f37b4cc5ad Different created_at and updated_at time in api merge_requests spec. 2014-09-15 11:54:49 +02:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
Dmitriy Zaporozhets ce49f035cf Fix access_level api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 77c64a9b36 Replace project_access attribute with access_level in specs and API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:36:50 +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 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 757426dbb1 Add Member AR model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:54:10 +03:00
Marin Jankovski 9b59570c8e Fix diff_helper spec. 2014-09-12 21:02:50 +02: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
Marin Jankovski 8ebb26fcc1 Add diff_helper spec. 2014-09-09 13:17:42 +02:00