Commit Graph
30716 Commits
Author SHA1 Message Date
Phil Hughes 55982c3dbb Fixed placement of close button on merge requests 2016-06-18 21:40:59 +01:00
Jacob Schatz 0aab84c760 Merge branch 'star-fork-mobile' into 'master'
Display Star and Fork on mobile, fix #18537.

## What does this MR do?

Displays the Star and Fork buttons on mobile devices.

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

Nope.

## Why was this MR needed?

I wanted to star and/or fork projects while on my phone, I couldn't do that before.

## What are the relevant issue numbers?

#18537 

## Screenshots (if relevant)

![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png)

cc: @jschatz1 

See merge request !4714
2016-06-18 17:12:38 +00:00
Jacob Schatz 0766936340 Merge branch 'milestones-show-mrs' into 'master'
Add merge request data to the progress information on Milestones pages.

## What does this MR do?

Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.

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

I don't think so.

## Why was this MR needed?

The milestone progress % didn't accurately reflect the open/merged MRs.

## What are the relevant issue numbers?

Fixes #13980

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png)

After:

![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc: @jschatz1

See merge request !4719
2016-06-18 17:09:45 +00:00
Jacob Schatz 93ad4b13f0 Merge branch '18762-feedback-btn' into 'master'
Fix margin & padding on activity btn

## What does this MR do?
Fixes alignment of activity btn

## What are the relevant issue numbers?
Closes #18762 

## Screenshots (if relevant)
![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png)


See merge request !4750
2016-06-18 16:45:07 +00:00
Jacob Schatz 81204f3d4a Merge branch 'comment-form-button-spacing' into 'master'
Fixed alignment of buttons in note forms

## What does this MR do?

Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group.

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png)

![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png)


See merge request !4740
2016-06-18 16:41:33 +00:00
Jacob Schatz e73ace4ccc Merge branch 'dz-organize-admin-settings' into 'master'
Move admin->runners tab as subnav of overview tab

cc @annabeldunstone 

See merge request !4716
2016-06-18 16:40:01 +00:00
Jacob Schatz a61550a814 Merge branch 'tags-edit-tooltip-placement' into 'master'
Fixed tooltip placement on edit tags button

## What does this MR do?

Moves the placement of the tooltip to the body so not to affect the movement of the button.

## Screenshots (if relevant)

Old:

![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif)

New:

![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif)


See merge request !4737
2016-06-18 16:35:51 +00:00
Jacob Schatz d0bca4b83f Merge branch 'branch-buttons-size' into 'master'
Fixed size of buttons in branches list

## What does this MR do?

The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags

## What are the relevant issue numbers?

#18677 

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_10.38.31](/uploads/19fc173e3f549a84bb14517613403792/Screen_Shot_2016-06-17_at_10.38.31.png)

See merge request !4735
2016-06-18 16:34:12 +00:00
Jacob Schatz 79488092e7 Merge branch 'last-push-vertical-alignment' into 'master'
Aligns create merge request button vertically

## What does this MR do?

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4644#note_12507178 I have vertically aligned the button correctly.

## Screenshots (if relevant)

Here is my awesome screenshot to show it is centered vertically 

![Screen_Shot_2016-06-17_at_10.17.19](/uploads/e7bf5bcc5b254ed4db376c16460d79a5/Screen_Shot_2016-06-17_at_10.17.19.png)

See merge request !4733
2016-06-18 16:33:00 +00:00
Jacob Schatz 204da39685 Merge branch '18714_bulk_assign_labels_icon' into 'master'
Fixes item icon state when for issues that have the same labels assigned

## What does this MR do?
Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state.

## What are the relevant issue numbers?
Fixes #18714

## Screenshots (if relevant)

**Before**

![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif)

**After**

![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4721
2016-06-18 16:29:43 +00:00
Jacob Schatz f065decad1 Merge branch '18707-label-tooltips-dont-dissapear-firefox' into 'master'
Hide tooltip manually

## What does this MR do?
Fixes an issue with tooltips not dissapearing  on Firefox after toggling label priority

## What are the relevant issue numbers?
Closes #18707

## Screenshots (if relevant)

**Test on Firefox**

![label-firefox](/uploads/09ed05f81b9861d666e5d9ad805fb501/label-firefox.gif)
## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4715
2016-06-18 16:13:57 +00:00
Stan Hu b272879377 Merge branch '18819-wiki-link-filter-exception' into 'master'
Fix bug in `WikiLinkFilter`.

Closes #18819 

- [ ]  #18819 Wiki link filter exception
    - [x]  Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/6d169d36cabda783116bcb8e2e6f73254566a670/builds) passes
    - [ ]  Wait for merge
    - [ ]  Pick into 8.9

See merge request !4775
2016-06-18 13:10:11 +00:00
Timothy Andrew 6d169d36ca Fix bug in WikiLinkFilter.
1. An exception would be raised if the filter was called with an invalid
   URI. Mainly because we weren't catching the `Addressable` exception.

2. This commit fixes it and adds a spec for the filter.
2016-06-18 14:10:40 +05:30
Achilleas Pipinellis 3d766b347b Merge branch 'ci-scala-example' into 'master'
Ci scala example

## What does this MR do?

Add a scala CI example.

## Why was this MR needed?

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2984

See merge request !4774
2016-06-18 07:51:51 +00:00
Achilleas Pipinellis 56777e8956 Merge branch 'master' into ci-scala-example 2016-06-18 09:23:31 +02:00
Douwe Maan 00906b5bb6 Merge branch 'issue_12758' into 'master'
Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389
2016-06-17 23:28:22 +00:00
Felipe Artur 4b204f071e Small frontend code fixes and restore 8a2d88f commit 2016-06-17 19:57:59 -03:00
Douwe Maan 33d8972bf9 Merge branch 'fix-18717' into 'master'
Ensure that group owner cannot request access to a project of their group

## What does this MR do?

It fixes two things:

- 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group
- ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details)

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

Not really, these are pretty simple fixes.

## Why was this MR needed?

Because there was an issue created!

## What are the relevant issue numbers?

Fixes #18717.

## Does this MR meet the acceptance criteria?

- [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC
- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4729
2016-06-17 22:47:19 +00:00
Douwe Maan b218e82b5c Merge branch 'issuable-todo-improvements'
# Conflicts:
#	app/controllers/projects/todos_controller.rb
2016-06-18 00:42:36 +02:00
Robert Speicher 5ef749b7ad Merge branch 'gh-webhooks' into 'master'
Avoid that GitHub import fails when retrieving Webhooks for non GitHub admins

Closes #18729 

See merge request !4723
2016-06-17 22:03:57 +00:00
Douglas Barbosa Alexandre 6ec5044f74 Warn about admin privilege to disable GitHub Webhooks
[ci skip]
2016-06-17 18:18:52 -03:00
Douglas Barbosa Alexandre 7a34c7997b Listing GH Webhooks doesn't stop import process for non GH admin users 2016-06-17 18:17:34 -03:00
Robert Speicher 6980489ca8 Merge branch 'api-endpoints-award-emoji' into 'master'
API endpoints for award emoji

Closes #10884 

See merge request !4575
2016-06-17 20:49:36 +00:00
Z.J. van de Weg e0bdcd2f2f fixup! updated docs for api endpoint award emoji 2016-06-17 22:03:57 +02:00
Jacob Schatz 71ecd8c6ed Merge branch 'commit-header' into 'master'
Fixes header vertical centering.

Fixes header centering. 

![ss__2016-05-16_at_5.26.30_PM](/uploads/300b64afc6585023f0e0dbbf721c359a/ss__2016-05-16_at_5.26.30_PM.png)

cc @dzaporozhets 

See merge request !4170
2016-06-17 19:55:33 +00:00
Robert Speicher d97b3d1407 Merge branch 'fix-todos-counters' into 'master'
Ensure Todos counters doesn't count Todos for projects pending delete

Use `TodosFinder` instead of `current_user.todos` to filter projects
pending delete on Todos counters helpers.

Counters should not reflect the number of Todos displayed on the tabs.

Fixes #18633

See merge request !4663
2016-06-17 19:47:03 +00:00
Robert Speicher d9d149244a Merge branch 'disable-saml-account-unlink' into 'master'
Disable the unlink feature for SAML connected accounts (social login).

This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent).

Fixes #18613

See merge request !4662
2016-06-17 19:27:51 +00:00
Douglas Barbosa Alexandre 1638794734 Update CHANGELOG 2016-06-17 16:17:43 -03:00
Douglas Barbosa Alexandre 2878c99005 Ensure Todos counters doesn't count Todos for projects pending delete 2016-06-17 16:17:43 -03:00
Robert Speicher 1db4fd3ae7 Merge branch 'repo-check-require-push-events' into 'master'
Do not check repos without push events

Reduce false positives from automatic repository checks by skipping
projects without push events.

See merge request !4684
2016-06-17 19:14:43 +00:00
Z.J. van de Weg 05a4a586b5 Add endpoints for award emoji on notes
Docs also added.
2016-06-17 21:02:51 +02:00
Yorick Peterse bb4a1ef6c1 Merge branch '18034-cache-todo-counter' into 'master'
Cache todo counters (pending/done)

See merge request !4438
2016-06-17 18:37:43 +00:00
Jacob Schatz 39a3ab7f3a Merge branch 'assignee-dropdown-selected' into 'master'
Fixed issue with assignee dropdown not selecting correctly

## What does this MR do?

Fixes an issue with assignee dropdown not selecting correctly.

See merge request !4762
2016-06-17 18:29:12 +00:00
Z.J. van de Weg 34558315d9 Sort API endpoints and implement feedback 2016-06-17 20:08:16 +02:00
Z.J. van de Weg 3f88221c2d Add endpoints for Award Emoji
This only supports Issues and MergeRequests right now because of the
consistency of the routes those models provide.
2016-06-17 20:07:17 +02:00
Phil Hughes 721fa87dec Fixed issue with assignee dropdown not selecting correctly 2016-06-17 19:02:18 +01:00
Robert Speicher 6c37e0f617 Merge branch 'clipboard-buttons-fix' into 'master'
Fix clipboard buttons on "Check out branch" modal.

Closes #18794 

See merge request !4760
2016-06-17 18:00:03 +00:00
Robert Speicher 04f72a3b96 Merge branch 'clipboard-button-styling' into 'master'
Fixed styling of clipboard button

Closes #18773 

See merge request !4728
2016-06-17 17:56:47 +00:00
Stan Hu 022dfd8eec Merge branch '18745-fix' into 'master'
Fix a 'wrong number of arguments' error

## What does this MR do?

Fixes #18745.

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

No.

## Why was this MR needed?

To fix #18745.

## What are the relevant issue numbers?

Fixes #18745.

## Does this MR meet the acceptance criteria?

- [ ] Tests
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4757
2016-06-17 17:55:46 +00:00
Robert Speicher a6e8ff21f6 Merge branch 'track-total-method-call-time' into 'master'
Track method call times/counts as a single metric

This changes method call tracking so only a single metric is emitted regardless of the number of calls. This allows us to more accurately measure the total execution time of a method as well as the number of times a method is called. See 851e3ff7578973c2206628424eac3b951a3c656d for more details.

Method call tracking tracked calls individually meaning the end statistics may not always be accurate enough to get a good understanding of where time is spent.

See merge request !4754
2016-06-17 17:46:18 +00:00
Phil Hughes 914f973108 Removed update method
Re-structured controller spec
Renamed issuable param to issuable_id
2016-06-17 18:31:37 +01:00
Achilleas Pipinellis 4d9161603a Merge branch 'sidekiq-api-metrics' into 'master'
Added API endpoint for Sidekiq Metrics.

## What does this MR do?

It adds an API endpoint to gather metrics about Sidekiq, it's jobs, queues, and processes.

## Why was this MR needed?

There was no API endpoint for Sidekiq information.

## What are the relevant issue numbers?

Fixes #7171

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing

See merge request !4653
2016-06-17 17:29:40 +00:00
Felipe Artur e5aa902860 Merge master into issue_12758 2016-06-17 14:29:11 -03:00
Connor Shea 12b3952477 Fix clibpoard buttons on "Check out branch" modal.
Also document the clipboard_button_with_class method.

Fixes #18794.
2016-06-17 11:27:18 -06:00
Yorick PeterseandRobert Speicher be3b878443 Track method call times/counts as a single metric
Previously we'd create a separate Metric instance for every method call
that would exceed the method call threshold. This is problematic because
it doesn't provide us with information to accurately get the _total_
execution time of a particular method. For example, if the method
"Foo#bar" was called 4 times with a runtime of ~10 milliseconds we'd end
up with 4 different Metric instances. If we were to then get the
average/95th percentile/etc of the timings this would be roughly 10
milliseconds. However, the _actual_ total time spent in this method
would be around 40 milliseconds.

To solve this problem we now create a single Metric instance per method.
This Metric instance contains the _total_ real/CPU time and the call
count for every instrumented method.
2016-06-17 13:09:55 -04:00
Rémy Coutable 1ca1ebc09b Merge branch 'registry-500-fix' into 'master'
Properly support application/json in Container Registry

## What does this MR do?
When requesting tags a `application/json` is used by `docker/distribution`.

## Why was this MR needed?
Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669

## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736


See merge request !4742
2016-06-17 17:06:55 +00:00
Paco Guzman f6bfa46daa Cache todo counters (pending/done)
- As todos are created/updated inside the TodoService
we repopulate the cache just there for both pending/done todos
- Todos as mark as done from the TodosController we update cache
there too
- All the added methods are kept in the User class for cohesion
2016-06-17 19:04:36 +02:00
Rémy Coutable 266fd1161c Fix a 'wrong number of arguments' error
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17 19:04:32 +02:00
Patricio Cano 23457cba44 Added missing mount point for Sidekiq Metrics API, after it got lost on rebase. 2016-06-17 11:49:27 -05:00
Robert Speicher fcd9f90641 Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master'
Fix error when editing an issuable with a task list

Closes #18712

See merge request !4751
2016-06-17 16:44:08 +00:00