Commit Graph
13763 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
Dmitriy Zaporozhets ab4ea3720c Merge branch 'rs-archive-cache-worker-cron' into 'master'
Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663
2016-04-13 12:53:01 +00: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
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
Jacob Schatz 64d71b4dfc Merge branch 'notes-input' into 'master'
Wrap text in notes box if longer than code in diff

* Fixes branch name overflow
* Text and inline `code` wraps in comments
* `code` blocks scroll horizontally

![Screen_Shot_2016-04-11_at_4.59.15_PM](/uploads/39eee7d35ea79d1a3944aa6281b72121/Screen_Shot_2016-04-11_at_4.59.15_PM.png)

See merge request !3626
2016-04-12 22:08:42 +00:00
Douglas Barbosa Alexandre 6a238c37e0 Fix todo_target_path for todos where target was removed 2016-04-12 18:06:52 -03:00
Annabel Dunstone 60736db429 Remove max-width from comments 2016-04-12 16:04:33 -05:00
Annabel Dunstone d3ff7ca084 Input updates 2016-04-12 15:07:44 -05:00
Annabel Dunstone 447f3613b7 Wrap text in notes box if longer than code in diff 2016-04-12 15:07:44 -05:00
Jacob Schatz 20418dc7da Merge branch 'issue_14206' into 'master'
Fix datetimes on tooltips

Closes #14206 

Updates tooltip datetimes on `.timeago()` instances. 

**Inline notes**

![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png)

**Existing and new notes**

![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png)


**Issuable dates**

![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png)

**Build dates**

![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png)

See merge request !3497
2016-04-12 19:28:55 +00: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
Jacob Schatz 2c9894d457 Merge branch 'project-title-dropdown' into 'master'
Project dropdown in header uses new dropdown



See merge request !3339
2016-04-12 17:50:27 +00:00
Jacob Schatz c52c192249 Merge branch 'member-access-note-row' into 'master'
Fixed issue with member access not being visible on notes

This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement

![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png)

Fixes #15049

See merge request !3618
2016-04-12 17:21:12 +00:00
Jacob Schatz e1838980c6 Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'
Fix quick submit missing in edit merge request page

closes #14953 

![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif)

See merge request !3601
2016-04-12 17:15:52 +00:00
Jacob Schatz a5cb6b0b83 Merge branch 'admin-pages-layout-sass-update' into 'master'
Updated media query for admin/groups search box

@jschatz1 based on your comment https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3523#note_4632743

See merge request !3599
2016-04-12 17:13:47 +00:00
Jacob Schatz fa0de68cd8 Merge branch 'right-sidebar-link-hover' into 'master'
Fixed colour of dropdown link hover

![Screen_Shot_2016-04-07_at_16.02.40](/uploads/bfbfa5d1b82576b6bafaefd567effa06/Screen_Shot_2016-04-07_at_16.02.40.png)

See merge request !3596
2016-04-12 17:12:16 +00: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
Phil HughesandJacob Schatz 6416f8eab1 Updated based on Ruby feedback 2016-04-12 13:10:43 -04:00
Phil HughesandJacob Schatz f870857ddd Updated tests 2016-04-12 13:10:43 -04:00
Phil HughesandJacob Schatz dca50ac1d4 Project dropdown in header uses new dropdown 2016-04-12 13:10:43 -04:00
Jacob Schatz 5713c7cfb3 Merge branch 'fix_labels_not_showing_in_todos' into 'master'
Fix labels not displayed on todos page

closes #14512,#13920

# For Todos

## Before
![Screen_Shot_2016-03-23_at_8.59.32_PM](/uploads/0c22c7674783031c9be842860082fdc2/Screen_Shot_2016-03-23_at_8.59.32_PM.png)

## After
![Screen_Shot_2016-03-24_at_12.35.06_PM](/uploads/f62d3f39c0aa2f7079368e157a3a558c/Screen_Shot_2016-03-24_at_12.35.06_PM.png)

# For Activity Feed

## Before
![Screen_Shot_2016-03-24_at_12.37.41_PM](/uploads/744370db7a4bd3782c029d80c3694ee7/Screen_Shot_2016-03-24_at_12.37.41_PM.png)

## After
![Screen_Shot_2016-03-24_at_12.37.00_PM](/uploads/9939817c14e98b50b3e16c8b7b9cf009/Screen_Shot_2016-03-24_at_12.37.00_PM.png)

See merge request !3371
2016-04-12 17:06:29 +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
Jacob Schatz 2082879d2f Merge branch 'commit-message-prefilled' into 'master'
Prefills commit message in edit file

See #14488 

![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png)

See merge request !3564
2016-04-12 15:53:14 +00:00
Jacob Schatz 63265243b5 Merge branch 'build-notification-fixes' into 'master'
Build notification null check

Cancels build notification interval on page change

See merge request !3540
2016-04-12 15:49:33 +00:00
Robert Speicher d75ec6cd46 Merge branch 'fix-missing-saml-error-handling' into 'master'
Add proper nil and error handling to SAML login process

While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks.

I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check.

See merge request !3609
2016-04-12 15:46:39 +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
Robert Speicher cba2c437e5 Move RepositoryArchiveCacheWorker to sidekiq-cron
Closes #15105
2016-04-12 11:12:05 -04:00
Douglas Barbosa Alexandre ef22b76b73 Simplify Projects::NotificationSettingsController 2016-04-12 12:10:58 -03: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
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 9aefaa41ab Fix code review issues 2016-04-12 14:24:05 +02:00
Robert Schilling ba21c00f01 Delete notes via API 2016-04-12 14:24:05 +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 fe58c1f13c Fix partial for update project notifications 2016-04-11 20:50:27 -03:00
Douglas Barbosa Alexandre bee28e1785 Requires user to be signed in when changing notification settings 2016-04-11 20:50:26 -03:00
Douglas Barbosa Alexandre 93a10f17e0 Reuse User#notification_settings_for when it's possible 2016-04-11 20:50:26 -03:00
Robert Speicher 0913204f9b Merge branch 'issue_1752' into 'master'
Fix milestone removal problem when editing issues

fixes #1752 

See merge request !3571
2016-04-11 23:26:45 +00:00
Felipe Artur 476cf23fc3 Allow to close invalid merge request 2016-04-11 19:00:59 -03:00
Alfredo Sumaran 4472752595 Merge branch 'master' into issue_14206 2016-04-11 16:45:58 -05:00
Alfredo Sumaran 38a4f5cec6 Rename method and initialize .timeago inside 2016-04-11 16:45:03 -05:00
Phil Hughes 44a95c5dea Added back text used on merge commit message 2016-04-11 17:41:47 +01:00
Phil Hughes 6333ebe619 Prefills commit message in edit file
See #14488
2016-04-11 17:40:36 +01:00
Phil Hughes 1b4a56bdb0 Fixed failing tests 2016-04-11 17:28:54 +01:00
Phil Hughes 6a13b37222 Fixed missed conflict 2016-04-11 17:20:47 +01:00
Phil Hughes 843bc44aa9 Preparing build text 2016-04-11 17:20:47 +01:00
Phil Hughes 552cde76fa Hides notification after X amount of seconds 2016-04-11 17:20:47 +01:00
Phil Hughes 99fe9c7b77 Corrects the button color on build status change 2016-04-11 17:20:47 +01:00
Phil Hughes ce0678faa5 Rubocop fix 2016-04-11 17:20:47 +01:00