Commit Graph
13590 Commits
Author SHA1 Message Date
Valery Sizov e36334c770 allow to use http in redirect url 2015-01-22 18:39:05 -08:00
Dmitriy Zaporozhets 4ade9bf24d lighter hover color 2015-01-22 17:05:31 -08:00
Dmitriy Zaporozhets b1dffe6729 Merge branch 'disable-turbolink-on-ci-links' into 'master'
Disable turbolink on links pointing out to CI services

### What does this MR do?

This MR adds 'data-no-turbolink' attribute into all links pointing to CI services.

### Are there points in the code the reviewer needs to double check?

No

### Why was this MR needed?

In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript.

This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them.

### What are the relevant issue numbers / Feature requests?

I consider this a small fix, no issue has been added.

See merge request !305
2015-01-22 23:04:43 +00: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 4a10b7509a Merge branch 'gh-import-disabled' into 'master'
Show modal window with instructions if GitHub integration disabled

See merge request !1424
2015-01-22 22:48:10 +00:00
Dmitriy Zaporozhets fc55a8964d Merge branch 'improve-commit-page' into 'master'
Improve commit page

See merge request !1423
2015-01-22 20:16:44 +00:00
Dmitriy Zaporozhets 3395457acb Fix vote specs for mysql 2015-01-22 12:08:47 -08:00
Dmitriy Zaporozhets 130663e7ad Show modal window with instructions if GH OAuth is not enables 2015-01-22 11:48:20 -08:00
Dmitriy Zaporozhets a5f1b67ed4 Dont allow image overflow in comment form and timeline 2015-01-22 11:24:05 -08:00
Dmitriy Zaporozhets 7411fb36c5 Show branches/tags as labels on commit page 2015-01-22 11:15:21 -08:00
Dmitriy Zaporozhets 7afa4d5791 Improve commit title 2015-01-22 11:14:29 -08:00
Dmitriy Zaporozhets d005c44816 Mix wrong comment about signup 2015-01-22 10:38:24 -08:00
Dmitriy Zaporozhets 08e0c0b6d6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-22 10:31:53 -08: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
Dmitriy Zaporozhets 98ee4a1fa7 Annotate models 2015-01-22 09:40:03 -08:00
Dmitriy Zaporozhets a5b255fbdf Code improvements according to styleguide 2015-01-22 09:37:47 -08:00
Dmitriy Zaporozhets 635f62be67 Merge branch 'stop_popen_zombies'
Conflicts:
	CHANGELOG
2015-01-22 09:20:42 -08:00
Hannes Rosenögger 47625ab75e Fix tests and CHANGELOG entry for project edit via API 2015-01-22 17:46:34 +01:00
Dmitriy Zaporozhets b73170f5c1 Merge branch 'sidekiq3' into 'master'
Upgrade to Sidekiq 3.3

Fixes #1807.  Upgrades Sidekiq to the latest stable release.

cc @sytse

See merge request !1419
2015-01-22 16:28:34 +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 a63187f28b Don't create zombies with IO.popen
The previous recommend incantation would leave the process we read from
hanging around, even though it had finished. That gives you a
'defunct'/'zombie' process.
2015-01-22 15:53:16 +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 2733e27864 Update CHANGELOG 2015-01-22 07:19:24 +00:00
Dmitriy Zaporozhets 2b10520b30 Merge pull request #7999 from cirosantilli/append-inplace
Append in place for strings and arrays [failure unrelated]
2015-01-21 23:07:15 -08:00
Dmitriy Zaporozhets 7f1633e294 Merge pull request #7615 from yglukhov/new-branch-submit-button-validation
Validation of 'Create branch' and 'Create tag' buttons
2015-01-21 23:05:02 -08:00
Dmitriy Zaporozhets 7d1e6f1546 Merge pull request #8607 from skburgart/fix-typos
Fix various typos
2015-01-21 23:02:48 -08:00
Dmitriy Zaporozhets 772e321120 Specify sidekiq patch version in changelog 2015-01-22 06:44:49 +00:00
Dmitriy Zaporozhets 581b2c5e90 Merge branch 'vote-count' of https://github.com/mc1arke/gitlabhq into mc1arke-vote-count
Conflicts:
	CHANGELOG
2015-01-21 22:40:12 -08:00
Dmitriy Zaporozhets 111d95f7b0 Merge pull request #8614 from axilleas/disable_check_all_issues_for_unprivileged_users
Disable 'check all issues' checkbox for unprivileged users.
2015-01-21 22:35:09 -08:00
Dmitriy Zaporozhets 2ac03a8661 Merge pull request #8626 from dblessing/fix_spinner
Fix spinner icon to match others
2015-01-21 22:33:19 -08:00
Dmitriy Zaporozhets ae1be43722 Make sidebar smaller by 10px 2015-01-21 15:58:35 -08:00
Dmitriy Zaporozhets 45bebd76d6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-21 15:56:29 -08:00
Dmitriy Zaporozhets 6a1aa4763a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-21 15:56:20 -08:00
Job van der Voort ac050b6f32 Merge branch 'fix_sentence_in_notification_page' into 'master'
Fix sentence in notification page

Correct the sentence in profile notification settings page.

/cc @jacobvosmaer @dzaporozhets

See merge request !1421
2015-01-21 21:39:14 +00:00
Marin Jankovski ab2a6111ee Fix the sentence on notification page. 2015-01-21 13:36:27 -08:00
Dmitriy Zaporozhets 8a66a10c2a Merge branch 'fix_avatar_url' into 'master'
Remove unnecessary / from avatar url

## What does this MR do?

This MR removes the unecessary / from the avatar url.

## What Use Case does this MR solve?

The // in the url cold lead to avatars not being displayed (reported on IRC)

With this MR the avatar url changes from
http://localhost:3000//uploads/user/avatar/1/gitlab_logo.png
to
http://localhost:3000/uploads/user/avatar/1/gitlab_logo.png

@dblessing Can you take a look?

See merge request !303
2015-01-21 20:04:35 +00:00
Drew Blessing 855fe20165 Fix spinner icon to match others 2015-01-21 14:02:30 -06:00
Dmitriy Zaporozhets e5d491b7c7 Merge pull request #7389 from skv-headless/show-submodules-in-diff
show diff in submodules
2015-01-21 11:53:09 -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
Dmitriy Zaporozhets 2395b8f079 Merge branch 'show_tags_in_commit_view' into 'master'
Show tags in commit view

### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)

### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit

### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png)

@dblessing Can you take a look at this MR as well please?

See merge request !297
2015-01-21 18:23:46 +00:00
Dmitriy Zaporozhets 1050f5230e Merge branch 'protected_branches' into 'master'
Developer can push to protected branch if allowed

#1876

See merge request !1418
2015-01-21 07:08:31 +00:00
Vinnie Okada 0eed5cace3 Upgrade Sidekiq to 3.3 2015-01-21 04:44:33 +00:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Dmitriy Zaporozhets 148740cc67 Merge branch 'github_importer' into 'master'
Github importer: AJAX update status

#1907

See merge request !1417
2015-01-20 21:07:37 +00:00
Dmitriy Zaporozhets 5ade3a6b78 We dont support ruby 2.2 yet 2015-01-20 11:59:35 -08:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
Dmitriy Zaporozhets f9fb76670f Merge pull request #8603 from jubianchi/hook-merge-request-action
Add action property to merge request hook
2015-01-20 09:12:20 -08:00
GitLabandBartlomiej Swiecki 47e0614669 Disable turbolink on links pointing out to ci services 2015-01-20 12:19:16 +01:00