Commit Graph
1622 Commits
Author SHA1 Message Date
Marin Jankovski 216fb6ee07 Fix slack service speck. 2014-10-06 10:44:01 +02:00
Marin Jankovski 86d5a63e5e Fix failing api specs. 2014-10-06 10:19:11 +02:00
Vinnie Okada 8dce0cd215 Fix cross-project reference test
Test for the correct link text in cross-project references.
2014-10-05 10:46:52 -05: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
Vinnie Okada 1b1ba6b0a5 Implement cross-project Markdown references
Enable linking to commits, merge requests, and issues in other projects
by prepending a namespaced project path to the reference.
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
Robert Schilling 91e346eb33 Merge pull request #7948 from cirosantilli/rm-outdated-comment
Remove outdated comment on the project test seed
2014-10-03 12:57:09 +02:00
Ciro Santilli 6014e28c2d Remove outdated comment on the project test seed 2014-10-03 12:21:23 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline
Factor out Emoji parsing using html-pipeline-gitlab
2014-10-02 11:18:40 +03:00
Dmitriy Zaporozhets ca1c35aa51 Merge branch 'fork-via-API' into 'master'
API: Add support for forking a project via the API

This adds an API call to create a fork of a project.

Such API "fork button" has been requested by feature requests summing up with 37 votes.

The GitLab user has flagged one of them as accepting merge/pull requests for this feature.

Motivation:

The ability to create a fork is missing in the API.
(The API currently only supports adding and removing the "forked" relationship between two existing projects)

This feature (create fork thru the API) feature has been requested via two feature requests:

15 votes, 13 comments: to be able to fork a project through the API
http://feedback.gitlab.com/forums/176466-general/suggestions/4125380-to-be-able-to-fork-a-project-through-the-api (it was marked as completed in error by referring to the much more special change which allows to add&delete fork information)

22 votes, 3 comments: add a "fork project" API call that acts like the "fork button"
http://feedback.gitlab.com/forums/176466-general/suggestions/5820264-add-a-fork-project-api-call-that-acts-like-the

The implementation is described in the text of the commit message (click on the "..." field to open it).

A comprehensive test suite is added as well: It covers all 5 success / failure modes:
1. Success case
2. Failure if authenticated user has no access the the project to be forked
3. Failure if the forked project already exists in the authenticated user's namespace
4. Failure if the forked project does not exist
5. Failure if not authenticated

Documentation for the new API call is added to the project help page: doc/api/projects.md

I have 2 additional merge requests in progress, one is based on this feature and extend it, the other is related to querying forks.

The merge request that would be directly related is based on a request written comment of one of the feature requests (that was independently also requested in a but entry):
The ability to fork a project (thru the API) to a given namespace, eg. a group, in one case, for trainings.

As this request does not change code, but only adds a new request API for creating forks, it does not have
the capability to break existing code, and as the test spec demonstrates, it works.

It allocates the API request POST /projects/fork/:id, the only other API path I'd have thought of would have been POST /projects/:id/fork but that path is already taken by the API for creating a new fork relationship between projects, so POST /projects/fork/:id is the remaining possibility that I could see.

See merge request !191
2014-10-01 10:20:57 +00:00
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
Bernhard Kaindl f030ee846e API: Initial support for forking a project via the API
This change adds POST /projects/fork/:id to the API for forking
a project into the namespace of the authenticated user, like the
"create fork" link in the GUI does. It also calls the same code.

Failure and permission checks (except for conflict) are already
implemented and handled in ForkService and the API, so the added
code is simple and does not alter anything.
2014-10-01 10:27:48 +02: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
Robert Schilling 390183a426 Factor out Emoji parsing using html-pipeline-gitlab 2014-09-26 01:32:33 +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