summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bug_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-10-121-0/+12
|\ | | | | | | | | | | | | | | | | | | Bug with apostrophe when at mentioning users This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`. Fixes #1034 See merge request !1165
| * Add a comment why this is done.Marin Jankovski2014-10-101-0/+6
| |
| * Substitute right single quote back with apostrophe.Marin Jankovski2014-10-101-0/+1
| |
| * Replace apostrophe with right single quote to avoid markdown interpretation ↵Marin Jankovski2014-10-091-0/+5
| | | | | | | | as issue 39.
* | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'Dmitriy Zaporozhets2014-10-121-5/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | Enabling markdown pipelines from gitlab Define which markdown pipelines are used in GitLab from application instead from gem. See merge request !1164
| * | Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-101-1/+6
| | |
| * | Enable markdown pipeline filters from inside gitlab.Marin Jankovski2014-10-091-8/+11
| |/
* | Add a comment on why we are using backward compatible ciphers.Marin Jankovski2014-10-101-3/+4
| |
* | Revert "update ssl_ciphers"Marin Jankovski2014-10-101-1/+1
|/ | | | This reverts commit c41e5f5018d059a9c57d2c19088e6c274cc60e10.
* Merge pull request #7988 from marcaube/patch-1Robert Schilling2014-10-081-1/+4
|\ | | | | Import - Display message when skipping repo
| * Update import.rakeMarc Aubé2014-10-071-1/+4
| | | | | | Output a message when a repo is skipped
* | Improve wiki path parsing in internal apiDmitriy Zaporozhets2014-10-071-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Developers can push to wiki repo. Protected branches does not affect wiki ↵Dmitriy Zaporozhets2014-10-073-22/+41
|/ | | | | | repo any more Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7963 from cirosantilli/factor-previewableDmitriy Zaporozhets2014-10-071-0/+4
|\ | | | | Factor markup? || gitlab_markdown? into new method
| * Factor markup? || gitlab_markdown? into new methodCiro Santilli2014-10-041-0/+4
| |
* | Add task lists to issues and merge requestsVinnie Okada2014-10-052-1/+29
| | | | | | | | | | | | | | | | Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a list item and turn it into a checkbox input. Users who can modify the issue or MR can toggle the checkboxes directly or edit the Markdown to manage the tasks. Task status is also displayed in the MR and issue lists.
* | Fix external commit linksVinnie Okada2014-10-051-0/+1
| | | | | | | | Display the '@' character for links to commits in other projects.
* | Fix external issue linksVinnie Okada2014-10-051-3/+4
| | | | | | | | | | Display the project path in links to issues in other projects that use an external issue tracker.
* | Track projects in ReferenceExtractorVinnie Okada2014-10-032-21/+33
| | | | | | | | | | | | Store both the project and identifier of extracted references. This prevents `ReferenceExtractor` from returning objects in the wrong project for cross-project references.
* | Fix ReferenceExtractorVinnie Okada2014-10-032-4/+6
| | | | | | | | | | The cross-project reference feature broke the ReferenceExtractor class; this fixes it.
* | Implement cross-project Markdown referencesVinnie Okada2014-10-031-31/+59
|/ | | | | Enable linking to commits, merge requests, and issues in other projects by prepending a namespaced project path to the reference.
* Merge pull request #7779 from Bugagazavr/hook_tag_push_eventsDmitriy Zaporozhets2014-10-032-3/+16
|\ | | | | Add tag push events to project hook api
| * Add tag_push_events to project hook apiKirill Zaitsev2014-10-032-3/+16
| |
* | Merge pull request #7664 from bbodenmiller/patch-2Sytse Sijbrandij2014-10-031-0/+2
|\ \ | | | | | | add HSTS Policy warning
| * | add HSTS Policy warningBen Bodenmiller2014-09-011-0/+2
| | | | | | | | | Add warning about HSTS header as it means user will need to provide secure connection access to site for next 24 months from page view. See https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security for more details.
* | | Add parenthesis to function def with arguments.Ciro Santilli2014-10-038-18/+18
| |/ |/|
* | Merge branch 'backup_fail_hard' into 'master'Dmitriy Zaporozhets2014-10-023-6/+22
|\ \ | | | | | | | | | | | | | | | Fail harder in the backup script See merge request !1143
| * | Fail harder in the backup scriptJacob Vosmaer2014-10-013-6/+22
| | | | | | | | | | | | | | | This change also shows the output of failed Git commands during the backup.
* | | Merge pull request #7853 from Razer6/feature/html_pipelineDmitriy Zaporozhets2014-10-021-23/+13
|\ \ \ | | | | | | | | Factor out Emoji parsing using html-pipeline-gitlab
| * | | Factor out Emoji parsing using html-pipeline-gitlabRobert Schilling2014-09-261-23/+13
| | | |
* | | | Merge branch 'fork-via-API' into 'master'Dmitriy Zaporozhets2014-10-011-0/+17
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | API: Initial support for forking a project via the APIBernhard Kaindl2014-10-011-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Try wear_merged! without argumentDmitriy Zaporozhets2014-10-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'add_active_directory_ldap_option' into 'master'Dmitriy Zaporozhets2014-10-011-1/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Add active directory ldap option Fixes #1557 See merge request !1139
| * | | Add option to gitlab config to specify if LDAP server is active directory.Marin Jankovski2014-09-301-1/+3
| | | |
* | | | Add rspec to test_ciDmitriy Zaporozhets2014-09-301-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Separate rake test for simplecovDmitriy Zaporozhets2014-09-301-0/+7
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'api/issues-filter-milestone' of ↵Dmitriy Zaporozhets2014-09-301-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | Filters issues by milestone via APIjubianchi2014-09-261-3/+12
| | | |
* | | | Add backup upload support to the rake taskJacob Vosmaer2014-09-291-2/+24
| | | |
* | | | Refactor commits graphDmitriy Zaporozhets2014-09-291-0/+49
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix branch APIDmitriy Zaporozhets2014-09-251-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix satellitesDmitriy Zaporozhets2014-09-251-8/+14
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix 500 error on empty search in projectDmitriy Zaporozhets2014-09-251-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix wikiuse-more-ruggedDmitriy Zaporozhets2014-09-251-4/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Rollback diff drop and set default commit id to HEADDmitriy Zaporozhets2014-09-251-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Improve diff and bump gitlab_git revisionDmitriy Zaporozhets2014-09-241-1/+1
| | |
* | | Use new version of gitlab_git with extended rugged usageDmitriy Zaporozhets2014-09-241-1/+1
|/ /
* | Merge pull request #7823 from cirosantilli/test-fetch-shellDmitriy Zaporozhets2014-09-241-1/+4
|\ \ | | | | | | Only clone GitLab Shell on tests if necessary.
| * | Only clone GitLab Shell on tests if necessary.Ciro Santilli2014-09-221-1/+4
| | |
View Lorry Controller Status