home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,942 Commits 48 Branches 340 Tags
6d899f46b577190eade2db9be548dcda271a9023
Commit Graph
3273 Commits
Author SHA1 Message Date
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Robert Speicher 2e4d9c1de6 Merge branch 'fix/project-import_url' into 'master' 
Fix for import_url fields on projects containing third-party credentials

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13955

See merge request !3066
 2016-04-15 21:52:00 +00:00
Robert Speicher 34b0561560 Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' 
Use rugged to change HEAD

_Originally opened at !2850 by @pmq20._

Needless to invoke gitlab_shell here, which is slow.

See merge request !3705
 2016-04-15 16:44:21 +00:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
James Lopez 05985b49a4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-15 08:49:08 +02:00
Douwe Maan 447a905088 Merge branch 'rs-trailing-slash-in-search' into 'master' 
Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633
 2016-04-15 06:46:47 +00:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
James Lopez e5f7a54530 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-14 18:12:10 +02:00
Rémy Coutable dd9ced0af9 Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' 
Fix revoking of authorized OAuth applications

Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.

Added a spec and also found that the `gon` variables were not being set for this view.

Closes #14370

See merge request !3690
 2016-04-14 15:26:09 +00:00
Stan Hu c7e384aab2 Add spec for deletion of authorized OAuth2 application 
Closes #14370

Move gon function into its own helper
 2016-04-14 07:24:58 -07:00
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master' 
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
 2016-04-14 13:41:30 +00:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Rémy Coutable c71cdb194f Merge branch 'simplify-gitlab-url_builder-15202' into 'master' 
Refactor and expose only Gitlab::UrlBuilder.build(record)

```
$ git grep Gitlab::UrlBuilder

app/models/commit.rb:      url: Gitlab::UrlBuilder.build(self),
app/services/issues/base_service.rb:      issue_url = Gitlab::UrlBuilder.build(issue)
app/services/merge_requests/base_service.rb:      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note)
lib/gitlab/note_data_builder.rb:        base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
spec/lib/gitlab/note_data_builder_spec.rb:    expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do
```

Fixes #15202.

See merge request !3696
 2016-04-14 10:27:49 +00:00
Frank Groeneveld 2fd05aed46 Allow empty recipient list when pusher is added 
Closes #13574
 2016-04-14 10:24:09 +02:00
Robert Speicher 0b447a9977 Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' 
Fix a bug with trailing slash in bamboo_url

Also, improve specs for BambooService

Similar to !3679.

See merge request !3680
 2016-04-13 16:18:46 +00:00
Robert Speicher 6020602359 Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' 
Fix trailing slash in teamcity_url

Originally opened at !2309 by @ctmay4.

As described in #3515, if you have trailing spaces in the the Teamcity server name, the service
will not work properly.  Switching from `URI.parse` to `URI.join` fixes it so that it works with
or without a trailing slash.

Fixes #3515.

See merge request !3679
 2016-04-13 16:17:39 +00:00
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00
P.S.V.RandRémy Coutable a575581284 Use rugged to change HEAD 2016-04-13 17:18:49 +02:00
Rémy Coutable 02cfbf0db5 Refactor and expose only Gitlab::UrlBuilder.build(record) 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-13 16:07:04 +02:00
Rémy Coutable acf911eeae Fix a bug with trailing slash in bamboo_url 
Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-13 15:58:14 +02:00
Rémy Coutable 8ea6c6d80c Merge branch 'issue_15044' into 'master' 
Allow to close invalid merge request

fixes #15044

See merge request !3664
 2016-04-13 09:10:57 +00:00
Rémy Coutable 3ea955a637 Improve TeamcityService and its specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-13 10:01:49 +02:00
Stan Hu 2ce7559d70 Fix repository cache invalidation issue when project is recreated with an empty repo 
To reproduce:

1. Create a project with some content
2. Rename the project
3. Create a new project with the same name.
4. Boom - 404.

After step 2, the branch and tag counts were not being cleared. This would
cause `repository.has_visible_content?` to erroneously return `true`
for the newly-created project.

Closes #13384
 2016-04-13 00:04:17 -07:00
Felipe Artur a64f1c7636 Add changelog entry, improve specs and model code 2016-04-12 15:52:03 -03:00
Robert Speicher 66e6052b93 Merge branch 'check-import-job-status' into 'master' 
Check and report import job status to help diagnose issues with forking

There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs.

See merge request !3672
 2016-04-12 18:07:33 +00:00
Douwe Maan 4516f40dfe Merge branch 'decouple-member-notification' into 'master' 
Decouple membership and notifications

This allow you to have notification setting per project even if you are member of group. 
It also creates background for having notification settings in project you are not member of. 


- [x] Make it work
- [x] Migrations
- [x] CHANGELOG
- [x] More tests
- [x] API

For #3359 

After this merge request there is still some work to be done: 

* create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
* remove notification_level field from Member model in 9.0
* make proper API for notification settings
* use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
* maybe more tests 


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3421
 2016-04-12 16:39:40 +00:00
Charles MayandRémy Coutable 061370790e Fix a bug with trailing slash in teamcity_url 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
 2016-04-12 18:08:05 +02:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Jacob Vosmaer b37d3b9423 Add repository_checks_enabled setting 2016-04-12 16:21:23 +02:00
Baldinof 3918fce5bd Hide number sign for string prefixed external issues 2016-04-12 10:01:52 +02:00
Stan Hu c162e0278c Check and report import job status to help diagnose issues with forking 2016-04-11 23:07:06 -07:00
Douglas Barbosa Alexandre 93a10f17e0 Reuse User#notification_settings_for when it's possible 2016-04-11 20:50:26 -03:00
Felipe Artur 476cf23fc3 Allow to close invalid merge request 2016-04-11 19:00:59 -03:00
Jeroen Bobbeldijk f36655dc8b Dont return null 2016-04-11 18:14:01 +02:00
Jeroen Bobbeldijk 27d2b35535 Add changelog, change code to guard clause 2016-04-11 18:11:49 +02:00
Douglas Barbosa Alexandre 73fdd4b83d Use Hash instead of Array on NotificationSetting#level enum 2016-04-11 10:23:40 -03:00
Jeroen Bobbeldijk 08c3936b83 Check head unborn in rugged 2016-04-11 15:10:14 +02:00
James Lopez be834c4de9 changed a few things based on feedback 2016-04-11 11:13:51 +02:00
Robert Speicher 5ffa8f0570 Escape the query argument provided to git grep by search_files 
Closes #14963.
 2016-04-09 18:50:21 -04:00
Douglas Barbosa Alexandre 635b65d120 Add method to return the user notification setting for a group, or a project 2016-04-08 18:46:45 -03:00
Douglas Barbosa Alexandre ee497599cc Use default_value_for to set default NotificationSetting#level 2016-04-08 17:24:27 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
James Lopez 350a9aa984 fix create_or_update_import_data 2016-04-07 16:53:15 +02:00
James Lopez a1a1d1f7de refactored create_or_update_import_data 2016-04-07 15:08:38 +02:00
James Lopez 15044e7d85 refactored a few things based on MR feedback 2016-04-07 15:00:20 +02:00
James Lopez e8b7e37c6d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-07 14:15:48 +02:00
Stan Hu 27b9f64efb Expire caches after project creation to ensure a consistent state 
Closes #14961
 2016-04-07 00:29:01 -07:00
Rémy Coutable e79b867d2b Ensure empty recipients are rejected in BuildsEmailService 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-06 16:14:51 +02:00
James Lopez 05be0c306e removed TODO [ci skip] 2016-04-06 11:13:19 +02:00
James Lopez b97654393e fix some issues with credentials 2016-04-06 10:36:30 +02:00