Commit Graph
507 Commits
Author SHA1 Message Date
Fatih Acet 6c89e2fd41 Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:23:40 -05:00
Fatih Acet a410c7afbf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:20:06 -05:00
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
2016-05-18 13:05:53 -05:00
ZJ van de Weg e0cabb67d0 Fix latests concerns 2016-05-18 08:47:15 -05:00
Kamil Trzcinski ac6992ba68 Fix specs 2016-05-16 23:40:40 -05:00
Kamil Trzcinski 04933fd572 Use container registry config stub 2016-05-16 18:07:49 -05:00
Kamil Trzcinski 91c4002a0c Improve test coverage 2016-05-16 18:03:55 -05:00
Kamil Trzcinski 28ed990704 Fix http status codes for container registry authentication service 2016-05-15 10:47:04 -05:00
Kamil Trzcinski 938d5b6fe4 Fix http status codes for container registry authentication service 2016-05-15 10:46:54 -05:00
Kamil Trzcinski 3d18b3a0e7 Merge branch 'docker-registry' into docker-registry-view 2016-05-15 08:53:18 -05:00
Kamil Trzcinski dfd0e2450a Improve authentication service specs 2016-05-15 08:52:26 -05:00
Kamil Trzcinski f63b6fc297 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 18:23:55 -05:00
Kamil Trzcinski f4f9184a01 Rename JWT to JSONWebToken 2016-05-14 18:23:31 -05:00
Kamil Trzcinski 715a8cfa2f Fix authentication service 2016-05-14 14:27:56 -05:00
Kamil Trzcinski 9496f7a71a Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:16:21 -05:00
Kamil Trzcinski 0a9979d9ef Rename specs 2016-05-14 11:16:11 -05:00
Kamil Trzcinski 654d5ad3f4 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:15:33 -05:00
Kamil Trzcinski 63cdf1aeb0 Use Auth::ContainerRegistryAuthenticationService 2016-05-14 11:11:48 -05:00
Kamil Trzcinski 774a510782 Fix specs 2016-05-14 09:39:33 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Kamil Trzcinski 692b5e0b47 Merge branch 'docker-registry' into docker-registry-view
# Conflicts:
#	app/controllers/jwt_controller.rb
#	app/services/jwt/container_registry_authentication_service.rb
2016-05-13 16:43:49 -05:00
Kamil Trzcinski 9e318bd99d Fix container registry permissions 2016-05-13 12:20:23 -05:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master'
Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087
2016-05-12 22:41:01 +00:00
Kamil Trzcinski fc2d985bfa Fix CI tests 2016-05-12 12:47:55 -05:00
Zeger-Jan van de Weg 7a4e7ad04e Fix tests and wrong choices during merge 2016-05-12 09:23:21 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Zeger-Jan van de Weg dccf8a9fc8 Add tests on Awardables and Award Emoji 2016-05-10 12:03:13 +02:00
Kamil Trzcinski c78b97df0e Added rspec for testing container registry authentication service 2016-05-09 22:06:32 +03:00
Douwe Maan 93b4a3a156 Merge branch 'fix/todos-for-private-group-mentions' into 'master'
Fix adding a todo for private group memebers



See merge request !4081
2016-05-09 18:31:41 +00:00
Connor Shea 9cc0937b3a Enable the Rubocop DeprecatedClassMethods cop
This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of
`.exist?`. Also fixes all existing uses of the deprecated methods.
2016-05-08 15:33:34 -06:00
Stan Hu adf9a51899 Escape HTML in commit titles in system note messages
Closes #17348
2016-05-07 08:41:10 -07:00
Ahmad Sherif ab4671f26a Fix adding a todo for private group members
Fixes #14002
2016-05-07 01:37:29 +02:00
Douwe Maan 0cdd4f310f Merge branch '14564-mr-automatic-title' into 'master'
Auto-set title for branches created from issues

This sets the title for a new MR to 'Resolves "$issue-title"' when:
- The source branch for the MR begins with a value iid.
- The MR has more than one commit in its diff (if there's one commit, keep using the commit's first line).
- The iid does not point to a confidential issue.

Single commit:

![A single commit uses the commit title](/uploads/cd34f59cd67f095c3034fae07950f8b5/image.png)

Multiple commits:

![Multiple commits use the issue title](/uploads/a322c406ddd56913c5aebd88d16e5a5e/image.png)

Confidential issue:

![A confidential issue uses the branch name](/uploads/7ae9b79de5f6101ced46802f3c3a6e71/image.png)

cc @DouweM @zj 

Closes #14564

See merge request !3966
2016-05-06 12:14:13 +00:00
Sean McGivern 09209725ce Don't auto-set MR title for confidential issues 2016-05-06 12:24:37 +01:00
Sean McGivern e76f339dcd Auto-set title for branches created from issues
If a branch starts with an issue's IID, followed by a hyphen, the
description will be updated to say that is closes the issue. This also
updates the title of the merge request to 'Resolves "$issue-title"', as
long as:
- There is more than one commit in the merge request (if there is only
  one commit, the commit's title will be used as before)
- The issue's IID is valid for the project
2016-05-06 12:24:37 +01:00
Sean McGivern 13d4d3c8b0 Add specs for MergeRequests::BuildService 2016-05-06 12:24:36 +01:00
Long Nguyen e016cdb73e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_14532_assign_labels_milestone_when_moving_issue 2016-05-05 15:02:46 +07:00
Long Nguyen 91f693c0c4 Update changelog, improve specs 2016-05-05 13:59:09 +07:00
Rémy Coutable 209f2f1e6f Use a similar approach to branch creation for tag creation
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 17:19:13 +02:00
Stan Hu f64b82e1da Support e-mail notifications for comments on project snippets
Closes #2334
2016-05-02 11:01:32 -07:00
Matt Oakes 28dcdb2779 Support supressing text file diffs on the default branch with .gitattributes
This is a combination of 3 commits.

- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
2016-04-29 12:45:15 +01:00
Long Nguyen 81467d2e04 Fix rubocop 2016-04-28 16:21:41 +07:00
Long Nguyen f7844a11be Code refactor and fix broken spec 2016-04-28 15:52:23 +07:00
Stan Hu eede032345 Backport GitHub Enterprise import support from EE
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
2016-04-26 21:00:55 -07:00
Long Nguyen d6d1daf430 Update specs 2016-04-27 00:03:09 +07:00
Long Nguyen 247ae96055 Allow to assign labels and milestone to target project when moving issue 2016-04-26 23:20:19 +07:00
Grzegorz Bizon 01ab6d704c Use association search in issuable create service 2016-04-22 08:01:50 +02:00
Grzegorz Bizon 006d8b268c Add affinity checks in issue create service 2016-04-22 08:01:50 +02:00
Grzegorz Bizon 8df63d1513 Update specs to accomodate issuable assign changes 2016-04-22 08:00:57 +02:00