Commit Graph
2755 Commits
Author SHA1 Message Date
Yorick Peterse 31e28ebceb Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +02:00
Rémy Coutable cf306b17bf Merge branch 'api-group-leaking' into 'master'
API: Return 404 if user does not have access to group

Closes #15185 

After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587.

See merge request !3683
2016-04-13 11:32:25 +00:00
Rémy Coutable 861e685e18 Merge branch 'api-move-issues' into 'master'
API: Ability to move an issue

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741

See merge request !3593
2016-04-13 10:55:12 +00:00
Rémy Coutable bbf49ffca1 Merge branch 'custom-transaction-tags' into 'master'
Added ability to add custom tags to transactions

cc @pcarranza 

See merge request !3674
2016-04-13 10:02:30 +00:00
Rémy Coutable e83424a13e Merge branch 'configure_trusted_proxies' into 'master'
Adjust the default trusted_proxies to only include localhost

And also allow other trusted proxies to be added from the config.yml.

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

Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208

See merge request !3524
2016-04-13 09:53:13 +00:00
Robert Schilling 2b036025d6 Update tests for moving issues via API 2016-04-13 11:31:50 +02:00
Robert Schilling 482f67edb4 API: Ability to move an issue 2016-04-13 11:23:42 +02:00
Yorick Peterse 3240ecfbef Added ability to add custom tags to transactions
One use case for this is manually setting the "action" tag for Grape API
calls. Due to Grape running blocks there are no human readable method
names that can be used for the "action" tag, thus we have to set these
manually on a case by case basis.
2016-04-13 11:22:37 +02:00
Robert Schilling b2f48d8c46 API: Return 404 if user does not have access to group 2016-04-13 11:11:09 +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
Yorick Peterse 57e660d8f3 Merge branch 'fix-stale-branch-count-cache' into 'master'
Fix repository cache invalidation issue when project is recreated with an empty repo

See merge request !3692
2016-04-13 08:37:51 +00:00
Rémy Coutable fc9e1be1fd Merge branch 'api-group-visibility' into 'master'
API: Ability to update a group

This makes it much easier to update a group after introducing the group visibility.

* Closes #14991 

See merge request !3587
2016-04-13 08:23:29 +00: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
DJ Mountney bb372ac97f Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting 2016-04-12 10:42:59 -07:00
Phil HughesandJacob Schatz 1ac6bdb5c8 Updated CHANGELOG 2016-04-12 13:10:43 -04:00
Phil HughesandJacob Schatz 63e54f1555 Updated based on Ruby feedback 2016-04-12 13:10:43 -04:00
Phil HughesandJacob Schatz 4293485a22 Updated Ruby
Added CHANGELOG item
2016-04-12 13:10:43 -04: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
Rémy Coutable d65d5c2d1a Merge branch 'feature/fix-14753' into 'master'
Fix #14753: Check if head is born before trying to detect main language

This MR makes sure that head exists before trying to detect the main language.
This prevents errors on repo's without a master branch.

Closes #14753

See merge request !3654
2016-04-12 15:34:56 +00:00
Jeroen Bobbeldijk c870686589 Add my name 2016-04-12 16:44:12 +02:00
Rémy Coutable 0b8852d3c4 Merge branch 'instrument-service-classes' into 'master'
Instrument all service classes

This will help us see where (mostly) Sidekiq code is spending time.

See merge request !3675
2016-04-12 14:39:54 +00:00
Rémy Coutable 13201a3a05 Merge branch 'hide_help_block_when_creating_project_inside_group' into 'master'
Hide help block when user is creating a new project inside a group

closes #14092 

![fix](/uploads/13721117c410c8fe6937d44a3b0a90a8/fix.gif)

See merge request !3427
2016-04-12 14:39:17 +00:00
Rémy Coutable e322b993e7 Merge branch 'api-delete-note' into 'master'
Delete notes via API

Supports deleting issues, snippets, and merge requests via the API.

* Closes #14944
* Closes #14845 
* Closes #6060 

@zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet.

@rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. 


See merge request !3557
2016-04-12 14:34:50 +00:00
Yorick Peterse 435892ed43 Changelog entry for service class instrumentation
[ci skip]
2016-04-12 16:07:58 +02:00
Rémy Coutable a5512099ce Merge branch 'api-get-tag' into 'master'
API: Ability to retrieve a single tag

* Closes #14330

/cc @dblessing

See merge request !3577
2016-04-12 14:04:40 +00:00
Robert Schilling d0cdc2ee73 API: Ability to update a group 2016-04-12 15:47:20 +02:00
Arinde Eniola 050110c9c9 hide help block when user is creating a new project inside a group 2016-04-12 14:41:34 +01:00
Robert Schilling 08a217cfcf Add changelog entry 2016-04-12 15:28:09 +02:00
Zeger-Jan van de Weg 6dbcb880cc Allow a project member to leave the projected through the API 2016-04-12 14:30:42 +02:00
Robert Schilling 49484f9a2c Fix changelog entry 2016-04-12 14:26:20 +02:00
Robert Schilling ba21c00f01 Delete notes via API 2016-04-12 14:24:05 +02:00
Rémy Coutable 734df1bb50 Merge branch 'api-fix-milestone-iid-filter' into 'master'
API: Add iid filter to milestones

This was documented in the API docs but it was never working because the iid filter was never applied to the milestones. The tests were working by accident because the were checking the first element, which was by accident the request element. 

* Closes https://github.com/gitlabhq/gitlabhq/issues/10122

See merge request !3588
2016-04-12 11:23:12 +00:00
Robert Schilling 9d03e8fd5c API: Add iid filter to milestones 2016-04-12 12:37:16 +02:00
Robert Schilling 10080ce362 API: Expose updated_at for notes 2016-04-12 12:32:34 +02:00
Rémy Coutable 8cb41f1989 Merge branch 'api-labels-info' into 'master'
API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels

Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238

See merge request !3569
2016-04-12 09:21:00 +00:00
Jeroen Bobbeldijk 27d2b35535 Add changelog, change code to guard clause 2016-04-11 18:11:49 +02:00
Douglas Barbosa Alexandre 9a44d6977a Merge branch 'master' into decouple-member-notification 2016-04-11 10:34:49 -03:00
Jacob Schatz 283ecf6e48 Merge branch 'redesign_labels_page' into 'master'
Redesign labels page

closes #14227 

## Desktop
![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png)

## Mobile
![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png)

See merge request !3507
2016-04-10 14:05:22 +00:00
connorshea 44d9f52fd9 Enable asset compression in production.
`config.assets.compress` needed to be explicitly enabled.

Follow-up to !3544. Resolves #14344.
2016-04-09 16:31:41 -06:00
Robert Speicher 9e2032173c Merge branch 'efficient-emoji-loading' into 'master'
Only load emoji spritesheet when necessary

On a normal issue where the only award emoji displayed by default are
the thumbs-up and thumbs-down emoji, this decreases the page load by
670KB or 250KB depending on pixel density.

Resolves #14334.

See merge request !3449
2016-04-09 00:17:12 +00:00
connorshea 3a196317ab Add "sprite" parameter to emoji_icon helper
The emoji_icon helper used to display the award emoji in Issue and
Merge Request views. By default the spritesheet is used, but passing
`sprite: false` to the `emoji_icon` helper makes the emoji render as
separate images.

For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and
any that have been awarded to the issue/MR) the independent images are
used. Only when the full emoji menu is opened does the full spritesheet
load.

On a normal issue this change decreases the page load by 670KB or 250KB
depending on pixel density.

Resolves #14334.
2016-04-08 17:38:31 -06:00
Douglas Barbosa Alexandre 47c8b7f303 Fix CHANGELOG 2016-04-08 18:46:46 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Rémy Coutable 312a09e7aa Merge branch 'api-expose-subscribed' into 'master'
API: Expose subscribed? on issues and merge requests

This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests.

Related to #6024

See merge request !3611
2016-04-08 14:36:54 +00:00
Robert Schilling fb2fde9d62 API: Expose subscribed? on issues 2016-04-08 15:53:04 +02:00
Jacob Schatz 8419f355d6 Merge branch 'revert-missing-changelog' into 'master'
Remove changelog entry for new navigation sidebar.



See merge request !3608
2016-04-07 22:05:42 +00:00
Robert Speicher 17fe62e3a3 Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7
[ci skip]
2016-04-07 17:45:36 -04:00
Jacob Schatz ff1903b77a Remove changelog entry for new navigation sidebar. 2016-04-07 17:25:19 -04:00
Jacob Schatz f79d3cda35 Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master'
Update number of Todos in the sidebar when it's marked as "Done"

Closes #15002 

See merge request !3600
2016-04-07 17:44:41 +00:00