Commit Graph
2209 Commits
Author SHA1 Message Date
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
2015-01-29 11:34:43 -08:00
Dmitriy Zaporozhets c9f18d4587 Make sure we dont have exception on date parsing 2015-01-29 01:03:20 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets 6e1f9e746c Merge branch 'gitlab_importer' into 'master'
Ability to clone project using oauth2 token

See merge request !1447
2015-01-29 07:03:30 +00:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Dmitriy Zaporozhets 953c1fff8f Be more careful with parsing changes from gitlab-shell 2015-01-28 17:00:40 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Valery Sizov 54f6d8c7b5 an ability to clone project with oauth2 token 2015-01-28 15:57:31 -08:00
Dmitriy Zaporozhets c6f7f09dd2 Merge branch 'fix_git_hook' into 'master'
Fix pushing to new branch when 'Check whether author is a GitLab user' is enebled.

See merge request !301
2015-01-27 22:16:22 +00:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'
Move external issue tracker away from yml config

See merge request !1442
2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets 7155507af5 Merge pull request #8609 from jubianchi/issues/6289-api-handle-error-project-repo
Handle errors on API when a project does not have a repository
2015-01-27 12:51:18 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Marin Jankovski 00a0d5aeea Move repetition to the parent. 2015-01-26 16:24:11 -08:00
Dmitriy Zaporozhets c916124178 Explicitly set before_filter for ref-related controllers 2015-01-26 15:01:51 -08:00
Dmitriy Zaporozhets 3e47ea5064 Files::CreateService can now commit file to empty repository 2015-01-26 13:31:24 -08:00
Marin Jankovski 65e700472b Update the issue tracker attribute on issue tracker change. 2015-01-26 11:39:32 -08:00
Valery Sizov fd1614726d fix pushing to new branch when check of author of commit is enabled 2015-01-26 10:53:10 -08:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Marin Jankovski 103a1bb06d Use service settings instead of config file settings to present issues. 2015-01-23 10:28:38 -08:00
Dmitriy Zaporozhets e49b636497 Merge branch 'feature_api_project_edit' into 'master'
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
2015-01-22 23:02:50 +00:00
Dmitriy Zaporozhets 02c5077fde Merge branch 'feature_api_milestone_issues' into 'master'
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
2015-01-22 18:31:18 +00:00
Mika MäenpääandHannes Rosenögger 7dd5656a5b Implement edit via API for projects 2015-01-22 16:58:01 +01:00
Jacob Vosmaer f937e05949 Stop git zombie creation during force push check 2015-01-22 15:51:20 +01:00
Hannes Rosenögger e03f1af00a Fix the test and add documentation for the "per-milestone issues API call" 2015-01-22 12:14:53 +01:00
Justin WhearandHannes Rosenögger 9d271538a8 Add per-milestone issues API call 2015-01-22 12:08:45 +01:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
2015-01-21 17:05:31 -08:00
Dmitriy Zaporozhets 0c4bb84910 Merge pull request #7762 from jubianchi/commit-closing-issues
Allow commit messages to close several issues at once
2015-01-21 11:49:13 -08:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
jubianchi b21a2d821a Allow commit messages to close several issues at once (thanks @123Haynes
for his work and help)
2015-01-20 10:45:48 +01:00
Dmitriy Zaporozhets d960b9aea2 Merge branch 'master' into 'master'
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
2015-01-20 05:03:22 +00:00
Marin Jankovski 465f41673a Merge branch 'database-fix-setting' into 'master'
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
2015-01-19 18:43:27 +00:00
jubianchi 39e54e21cb Handle errors on API when a project does not have a repository (Closes #6289) 2015-01-19 14:13:30 +01:00
Dmitriy Zaporozhets 0533ae7eec Merge pull request #8464 from dserodio/group-api-description
Add description attribute to group API (GET and POST)
2015-01-18 10:35:25 -08:00
Jeroen van Baarsen ec29ce4b02 Merge pull request #8307 from cirosantilli/project-api-comment-typo
Typo in project API events comment
2015-01-18 19:05:02 +01:00
Daniel Serodio 6ac8bb0f7c Add description attribute to group API (GET and POST) 2015-01-16 16:52:48 -02:00
Dmitriy Zaporozhets c5ba87a2fb Merge pull request #8096 from cirosantilli/regex-to-string
Replace regex methods by string ones since faster and more readable
2015-01-15 14:37:11 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge
Replace highlight.js with rouge-fork rugments
2015-01-15 14:28:24 -08:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Dmitriy Zaporozhets a0d4235c04 Send checkout sha for web hooks and services 2015-01-15 10:26:33 -08:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments
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.
2015-01-15 13:41:11 +01:00
Sytse Sijbrandij f8b97b454b Make view link come first so I don't have to mouse to the end of the email line. 2015-01-14 21:12:16 -08:00
DJ Mountney 02d8575a61 Check for database connection before loading current application settings 2015-01-14 16:23:46 -08:00
Dmitriy Zaporozhets 201067789a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-non-conflict 2015-01-14 09:38:29 -08:00
Marin Jankovski e348af1d4c Rescue database error in application settings if the database still doesn't exist. 2015-01-14 09:03:25 +01:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
2015-01-13 18:22:38 -08:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00