Commit Graph
1798 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0852d5e480 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 16:36:06 +03:00
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Jan-Willem van der Meer d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +02:00
Marin Jankovski 1d14676e0c Substitute right single quote back with apostrophe. 2014-10-10 08:24:58 +02:00
Valery Sizov 82c938ad75 annotate 2014-10-09 18:22:20 +03:00
Marin Jankovski a912308340 Add a test for apostrophe in code blocks. 2014-10-09 16:12:17 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Marin Jankovski 64e72af3cb Replace apostrophe with right single quote to avoid markdown interpretation as issue 39. 2014-10-09 14:20:49 +02:00
Marin Jankovski 099cf3558f Failing test for apostrophe at the end of user mention on project with issue iid 39. 2014-10-09 14:02:10 +02:00
Dmitriy Zaporozhets 21e9ed2eaf Merge branch 'improve-danger-zone' into 'master'
Improve danger zone

* show transfer/remove boxes by default
* ask person to type project name before transfer/remove

Fixes #1347

See merge request !1161
2014-10-08 13:58:31 +00:00
Dmitriy Zaporozhets b485fdb5c1 Improve project remove spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 15:05:14 +03:00
Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service
Conflicts:
	app/models/project.rb
2014-10-08 16:33:53 +08:00
Keith Pitt 76594d474c Added support for Buildbox 2014-10-08 16:30:04 +08:00
Vinnie Okada 68b5ac7f18 Add option to keep repo on project delete
Update the project API controller to use `Projects::DestroyService`
instead of calling `Project#destroy` directly.

Also add an optional parameter, `:keep_repo`, that allows a project to
be deleted without deleting the repository, wiki, and satellite from
disk.
2014-10-07 15:21:00 -05:00
Dmitriy Zaporozhets 0bf99f6557 Developers can push to wiki repo. Protected branches does not affect wiki repo any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 16:05:24 +03:00
Ciro Santilli f4efb19038 Add tests for tree edit routes
Critical because of possible confusion between /:id/preview
and /:id for a path that ends in preview.
2014-10-07 10:04:09 +02:00
Dmitriy Zaporozhets 70004f4ef6 Merge branch 'slack_integration' into 'master'
Slack integration

See merge request !1151
2014-10-06 16:14:48 +00:00
Marin Jankovski 0fed1b5876 Merge pull request #7964 from mr-vinn/task-lists
Add task lists to issues and merge requests
2014-10-06 17:29:06 +02:00
Dmitriy Zaporozhets 46b7a3f8f5 Prevent PG::Error exception when check commit reference on commit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-06 15:07:36 +03:00
Marin Jankovski e5998adc26 Accommodate new webhook url format. 2014-10-06 10:44:01 +02:00
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 fecd9c0cb2 Add specs for tasks
Add tests for the new task list functionality in the Markdown parser and
in issues and merge requests.
2014-10-05 22:15:36 -05: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
Bernhard Kaindl 84fbd29351 transfer_service_spec: cleanup, merge common code, check against nil
- replace creation of group2 with the use of group without add_owner(user)
- fold TransferService calls into new test function transfer_project
  - remove currently not used (and not working) gitlab_shell stub
    (will submit testcase simulating failure in gitlab_shell separately)
- add checks against not be_nil (result.should be_false passes even if nil)
2014-10-04 12:29:24 +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
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
Bernhard Kaindl c44764f523 Prepare ForkService to support forking projects to given namespaces
Remove overload of BaseService.initialize, so initialize gains params,
which is used to pass the namespace (like e.g. in TransferService).

The namespace is checked for permission to create projects in it.
2014-10-03 11:52:29 +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
Ciro Santilli 9567778f94 Fix version of test seed branches. 2014-10-01 08:56:04 +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