summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Repository to use new RepositoryCache classRobert Speicher2015-01-291-0/+25
| | | | | Abstracts away the lower-level implementation details from the Repository model.
* Make sure we dont have exception on date parsingDmitriy Zaporozhets2015-01-291-2/+2
|
* Cleanup and make contribution calendar fasterDmitriy Zaporozhets2015-01-291-59/+13
|
* Merge branch 'gitlab_importer' into 'master'Dmitriy Zaporozhets2015-01-291-1/+13
|\ | | | | | | | | | | Ability to clone project using oauth2 token See merge request !1447
| * an ability to clone project with oauth2 tokenValery Sizov2015-01-281-1/+13
| |
* | Refactor commit calendar a bit. Fixed datesDmitriy Zaporozhets2015-01-281-8/+0
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Dmitriy Zaporozhets2015-01-281-1/+1
|\ \ | | | | | | | | | haynes/gitlab-ce-commit_calendar
| * | Be more careful with parsing changes from gitlab-shellDmitriy Zaporozhets2015-01-281-1/+1
| |/
* | Add a commit calendar to the user profileHannes Rosenögger2015-01-291-0/+79
|/
* Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'Dmitriy Zaporozhets2015-01-271-7/+5
|\ | | | | | | | | | | Move external issue tracker away from yml config See merge request !1442
| * Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-262-11/+9
| |\ | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb
| * | Move repetition to the parent.Marin Jankovski2015-01-261-5/+4
| | |
| * | Update the issue tracker attribute on issue tracker change.Marin Jankovski2015-01-261-1/+1
| | |
| * | Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-236-14/+82
| |\ \
| * | | Do a check which issue tracker is used inside the project.Marin Jankovski2015-01-231-1/+1
| | | |
| * | | Use service settings instead of config file settings to present issues.Marin Jankovski2015-01-231-4/+3
| | | |
* | | | Merge pull request #8609 from ↵Dmitriy Zaporozhets2015-01-271-8/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jubianchi/issues/6289-api-handle-error-project-repo Handle errors on API when a project does not have a repository
| * | | | Handle errors on API when a project does not have a repository (Closes #6289)jubianchi2015-01-191-8/+29
| | | | |
* | | | | Refactor web editorDmitriy Zaporozhets2015-01-261-4/+4
| |_|_|/ |/| | |
* | | | Explicitly set before_filter for ref-related controllersDmitriy Zaporozhets2015-01-261-8/+0
| | | |
* | | | Files::CreateService can now commit file to empty repositoryDmitriy Zaporozhets2015-01-261-3/+9
| |_|/ |/| |
* | | Merge branch 'feature_api_project_edit' into 'master'Dmitriy Zaporozhets2015-01-221-0/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Implement edit via API for projects I've picked up https://github.com/gitlabhq/gitlabhq/pull/8055 fixed the few hound warnings and replaced all double quotes in the spec file where possible. # From the original PR: Implements edit via API for projects. Edit was part of missing features in feature request Full CRUD operations via API for projects. http://feedback.gitlab.com/forums/176466-general/suggestions/3904506-full-crud-operations-via-api-for-projects Feature is implemented using existing UpdateService for projects. Permission to change visibility level and name are checked in addition to check for permission to administer project. Doesn't allow updating project namespace id, because there was existing API-method for transferring project to a group. Documentation added to doc/api/projects.md. Uses API request PUT /projects/:id . Tests included for: 1. Success for changing path 2. Success for changing name 3. Success for changing visibility level 4. Success for changing all other attributes 5. Success for changing name & path to existing name & path but in different namespace 6. Failure if not authenticated 7. Failure if path exists in project's namespace 8. Failure if name exists in project's namespace 9. Failure if not sufficient permission to change name 10. Failure if not sufficient permission to change visibility level 11. Failure if not sufficient permission to change other attributes Allows updating following parameters: * name * path * visibility_level * public * default_branch * issues_enabled * wiki_enabled * snippets_enabled * merge_requests_enabled * description See merge request !310
| * | | Implement edit via API for projectsMika Mäenpää2015-01-221-0/+43
| | | |
* | | | Merge branch 'feature_api_milestone_issues' into 'master'Dmitriy Zaporozhets2015-01-221-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: List issues for a particular milestone # What does this MR do? This MR adds a new API method for retrieving the issues associated with a particular milestone. The resource is described at ":id/milestones/:milestone_id/issues", returning a simple array of issues. I've picked up gitlab-org/gitlab-ce!113 and fixed the test for it. From the original MR: This feature was motivated by an in-house project for reporting--for large projects, retrieving and filtering the entire issue list by milestone was becoming too slow, particularly when pagination required multiple requests. While this resource also uses pagination, it allows the consumer to limit reporting to the particular milestone they are interested in. @dblessing Please take a look :) See merge request !308
| * | | | Fix the test and add documentation for the "per-milestone issues API call"Hannes Rosenögger2015-01-221-1/+1
| | | | |
| * | | | Add per-milestone issues API callJustin Whear2015-01-221-0/+15
| | | | |
* | | | | Stop git zombie creation during force push checkJacob Vosmaer2015-01-221-1/+1
|/ / / /
* | | | Merge pull request #7762 from jubianchi/commit-closing-issuesDmitriy Zaporozhets2015-01-211-7/+12
|\ \ \ \ | |/ / / |/| | | Allow commit messages to close several issues at once
| * | | Allow commit messages to close several issues at once (thanks @123Haynesjubianchi2015-01-201-7/+12
| | | | | | | | | | | | | | | | for his work and help)
* | | | developer can push to protected branchesValery Sizov2015-01-202-6/+11
| |_|/ |/| |
* | | Github Importer: AJAX update statusValery Sizov2015-01-201-0/+2
|/ /
* | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-01-201-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | print validation errors when gitlab-rake gitlab:import:repos fails for project Currently, when gitlab-rake gitlab:import:repos is not able to import a project it justs prints "Failed trying to create project" to the console. There seems to be no way to find out what exactly has failed. Since the check uses validation, it should at least print the validation issues. That might be a bit cryptic, but may be better than leaving the user in the dark completely. See merge request !147
| * | print validation errors when import failsBastian Krol2014-07-091-0/+1
| | |
* | | Merge branch 'database-fix-setting' into 'master'Marin Jankovski2015-01-191-19/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | Check for database connection when running current_application_settings The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown. See merge request !292
| * | Check for database connection before loading current application settingsDJ Mountney2015-01-141-19/+4
| | |
* | | Merge pull request #8464 from dserodio/group-api-descriptionDmitriy Zaporozhets2015-01-182-2/+2
|\ \ \ | | | | | | | | Add description attribute to group API (GET and POST)
| * | | Add description attribute to group API (GET and POST)Daniel Serodio2015-01-162-2/+2
| | | |
* | | | Merge pull request #8307 from cirosantilli/project-api-comment-typoJeroen van Baarsen2015-01-181-1/+1
|\ \ \ \ | |/ / / |/| | | Typo in project API events comment
| * | | Typo in project API events commentCiro Santilli2014-11-141-1/+1
| | | |
* | | | Merge pull request #8096 from cirosantilli/regex-to-stringDmitriy Zaporozhets2015-01-152-3/+3
|\ \ \ \ | | | | | | | | | | Replace regex methods by string ones since faster and more readable
| * | | | Replace regex methods by string ones since fasterCiro Santilli2014-12-282-3/+3
| | | | | | | | | | | | | | | | | | | | and more readable.
* | | | | Merge pull request #8425 from rumpelsepp/rougeDmitriy Zaporozhets2015-01-151-14/+13
|\ \ \ \ \ | | | | | | | | | | | | Replace highlight.js with rouge-fork rugments
| * | | | | Replace highlight.js with rouge-fork rugmentsStefan Tatschner2015-01-151-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same.
* | | | | | Test git builder over annotated tagDmitriy Zaporozhets2015-01-151-2/+5
| | | | | |
* | | | | | Send checkout sha for web hooks and servicesDmitriy Zaporozhets2015-01-152-52/+70
|/ / / / /
* | | | | Make view link come first so I don't have to mouse to the end of the email line.Sytse Sijbrandij2015-01-141-1/+1
| |_|/ / |/| | |
* | | | Rescue database error in application settings if the database still doesn't ↵Marin Jankovski2015-01-141-1/+12
| | | | | | | | | | | | | | | | exist.
* | | | Improve github import page UIDmitriy Zaporozhets2015-01-131-3/+3
| | | |
* | | | Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-134-1/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/helpers/projects_helper.rb
| * | | | Github ImporterValery Sizov2015-01-104-1/+115
| | | | |