Commit Graph
10326 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dee28c50a9 Merge branch 'new-member-page' into 'master'
Improve group and project members pages

* Improve UI for group members page
* Improve UI for project members page

For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057

This MR should solve usability problem with adding new member to group/project 

See merge request !1886
2015-11-25 18:20:22 +00:00
Yorick Peterse ef2bc0f0bf Merge branch 'sherlock-total-query-time' into 'master'
Added total query time to Sherlock

This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).

See merge request !1887
2015-11-25 11:29:48 +00:00
Dmitriy Zaporozhets d262daa4f0 Split group feature tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 11:44:39 +01:00
Dmitriy Zaporozhets 34cc8f4a60 Improve project members page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets d9749c8d36 Improve UI for group members page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 10:24:29 +01:00
Robert Speicher a2915aeb66 Rescue StandardError, not Exception 2015-11-24 16:12:25 -05:00
Dmitriy Zaporozhets 4caef63d82 Fix 500 error when update group member permission
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-24 16:13:21 +01:00
Dmitriy Zaporozhets d1a7356398 Fix ultra-light color for small text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-24 11:36:53 +01:00
Yorick Peterse 97f8c6279f Added total query time to Sherlock
This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).
2015-11-24 10:57:21 +01:00
Robert Speicher 31a34b5917 Merge branch 'ci-artifacts-path' into 'master'
Expose artifacts path

This fixes broken artifacts storage path.

Fixes #3607 
Fixes #3608

Related: gitlab-org/omnibus-gitlab!544

See merge request !1869
2015-11-23 22:19:13 +00:00
Robert Speicher 2d77a21d59 Merge branch 'ci-fix-500' into 'master'
Fix 500 when using CI

- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template

Fixes #3556 

See merge request !1873
2015-11-23 21:51:51 +00:00
Robert Speicher 148eb04a9a Merge branch 'fix-clipboard-styling-in-create-mr' into 'master'
Fix CSS styling for clipboard icon in new MR page

Closes #3602 

See merge request !1870
2015-11-23 21:18:09 +00:00
Douwe Maan 761bf63810 Merge branch 'issue_2296' into 'master'
Generate system note after Task item has been updated on Issue or Merge Request.

Reference: #2296 

Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.

See merge request !1848
2015-11-23 13:09:34 +00:00
Kamil Trzcinski 57e974c03b Fix 500 when using CI
- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template
2015-11-23 13:51:41 +01:00
Kamil Trzcinski 11728b50f9 Expose artifacts path 2015-11-23 13:05:22 +01:00
Dmitriy Zaporozhets 1324cc2f6e Merge branch 'issue_2993' into 'master'
Update copy used in alert message when deleting branches or tags.

Reference: #2993 

Before:

![Screen_Shot_2015-11-19_at_4.10.34_PM](/uploads/5cdf7e8c5d4c6bd9e18584b118420c8c/Screen_Shot_2015-11-19_at_4.10.34_PM.png)

![Screen_Shot_2015-11-19_at_4.14.19_PM](/uploads/80513b96492122860733462efa8c8015/Screen_Shot_2015-11-19_at_4.14.19_PM.png)

After:

![Screen_Shot_2015-11-19_at_4.59.56_PM](/uploads/80367f2acea0d22d36a5297bdc29163e/Screen_Shot_2015-11-19_at_4.59.56_PM.png)

![Screen_Shot_2015-11-19_at_4.59.30_PM](/uploads/134cf02d1fb3feff2159b5659d149d54/Screen_Shot_2015-11-19_at_4.59.30_PM.png)

See merge request !1846
2015-11-23 10:56:02 +00:00
Douwe Maan 9a273dbe34 Merge branch 'issue-2831' into 'master'
Fix Assignee selector when 'Unassigned' #2831

Fixes #2831 

![Screen_Shot_2015-11-21_at_12.04.42_AM](/uploads/e3cb98ff805366805f4a989d927e3f10/Screen_Shot_2015-11-21_at_12.04.42_AM.png)


See merge request !1860
2015-11-23 10:51:06 +00:00
Stan Hu ab238a7677 Fix CSS styling for clipboard icon in new MR page
Closes #3602
2015-11-22 07:23:56 -08:00
Robert Speicher 7b70a03e44 Merge branch 'award_fix' into 'master'
Emoji bug: Invalid url to image

Closes #3591

See merge request !1868
2015-11-22 04:10:25 +00:00
Robert Speicher b166ee6b1d Merge branch 'fix-award-emoji-api' into 'master'
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
2015-11-22 03:45:15 +00:00
Valery Sizov 3fc10d46f1 Emoji bug: Invalid url to image 2015-11-22 01:51:00 +02:00
Stan Hu 9155c82fdc Merge branch 'consistent-tags-api' into 'master'
Make tag API for release feature consistent

Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`.

On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404.

@stanhu Can you review?
@rspeicher This MR should go into 8.2

See merge request !1864
2015-11-21 22:27:48 +00:00
Robert Schilling 04a3d27eab Allow editing a release in API via PUT method 2015-11-21 22:34:53 +01:00
Robert Schilling 3ea05c5b5b Only allow to create a release if it does not exist yet 2015-11-21 22:24:34 +01:00
Robert Schilling 26b12e2c37 Add upvote/downvote fields to merge request and note API to preserve compatibility 2015-11-21 21:36:31 +01:00
Robert Speicher 78be7055e5 Merge branch 'award_fix' into 'master'
Award Emoji: fix for merge requests

Closes #3597

See merge request !1865
2015-11-21 18:58:47 +00:00
Robert Speicher 3e5ad3d326 Merge branch 'issue_3598' into 'master'
Remove accidentally added line.

Reference: #3598 

See merge request !1858
2015-11-21 17:20:12 +00:00
Valery Sizov fbac9e106d Award: merge request fix 2015-11-21 19:17:06 +02:00
Robert Schilling faef95af1a API: Return 404 if the tag for a release does not exist 2015-11-21 18:08:45 +01:00
Dmitriy Zaporozhets 0e0c90843f Merge branch 'fix-merge-requests-without-source-projects' into 'master'
Handle removed source projects in MR CI commits

Fixes #3599 

@dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this.

See merge request !1859
2015-11-21 09:40:03 +00:00
Dmitriy Zaporozhets e920414e6c Merge branch 'gitlab-ee-d39de0ea-backport' into 'master'
Port GitLab EE ProjectsFinder changes

These changes were added in GitLab EE commit
d39de0ea91. The tests were a bit bugged
(they used a non existing group, thus not testing a crucial part) which
I only noticed when porting CE changes to EE.

See merge request !1854
2015-11-21 09:37:06 +00:00
Dmitriy Zaporozhets 03755fb38f Merge branch 'ee-flog' into 'master'
Reduce method complexity in AutocompleteController

Backport of gitlab-org/gitlab-ee!58

See merge request !1833
2015-11-21 09:09:23 +00:00
Jose Corcuera be045553ea Fix Assignee selector when 'Unassigned' #2831 2015-11-20 23:55:17 -05:00
Yorick Peterse d496a6b919 Handle removed source projects in MR CI commits
When calling MergeRequest#ci_commit the code would previously raise an
error if the source project no longer existed (e.g. because the user
removed their fork).

See #3599 for more information.
2015-11-20 23:43:10 +01:00
Rubén Dávila 2ed48df79a Remove accidentally added line. #3598
It should exist in EE only.
2015-11-20 16:50:48 -05:00
Stan Hu 94b90db547 Merge branch 'fix-scss-syntax-error' into 'master'
fix syntax error in common.scss

Fix a syntax error.

See merge request !1857
2015-11-20 20:41:54 +00:00
Greg Smethells d22435f3ff fix syntax error in common.scss 2015-11-20 14:15:01 -06:00
Stan Hu da0b9cb347 Merge branch 'fix-drone-service-hook' into 'master'
Fix Drone web hook URL not being updated

Fixes regression of !1774: fixes Drone Web hook for both service templates and project services.



See merge request !1856
2015-11-20 20:05:56 +00:00
Rubén Dávila 3aabed3456 Fix bug that happened when replacing the Task list. #2296
REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/2296#note_2724697
2015-11-20 13:58:45 -05:00
Stan Hu ad1f451f24 Fix Drone web hook URL not being updated 2015-11-20 08:13:25 -08:00
Rubén Dávila fa9f2dec0e Monkey patching TaskList::Item is no longer required. #2296 2015-11-20 10:49:12 -05:00
Rubén Dávila fc18e96db3 Refactor creation of system notes for Issue/MR labels. #2296 2015-11-20 10:36:12 -05:00
Yorick Peterse fed059a12d Port GitLab EE ProjectsFinder changes
These changes were added in GitLab EE commit
d39de0ea91. The tests were a bit bugged
(they used a non existing group, thus not testing a crucial part) which
I only noticed when porting CE changes to EE.
2015-11-20 15:53:04 +01:00
Douwe Maan 5a4c56c38d Reduce method complexity in AutocompleteController 2015-11-20 13:49:24 +01:00
Valery Sizov f31ee52507 Fix for Emoji 2015-11-20 11:13:43 +02:00
Ruben DavilaandRubén Dávila 97afb84b31 Generate system note after Task item has been updated on Issue or Merge Request. #2296
Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.
2015-11-19 21:05:44 -05:00
Robert Speicher 2df492fd2f Add clipboard button to merge request cross-project reference 2015-11-19 19:25:22 -05:00
Robert Speicher b3cd7243e9 Merge branch 'rs-safari-clipboard-fallback' into 'master'
Add a fallback for Safari copy-to-clipboard

Also, hide the tooltip in a less stupid way.

Closes #3547

See merge request !1844
2015-11-19 23:23:31 +00:00
Kamil Trzciński 0383f84d88 Merge branch 'ci-yaml-validation' into 'master'
Commits without .gitlab-ci.yml are marked as skipped

- Commits without .gitlab-ci.yml are marked as skipped
- Save detailed error when YAML syntax

This also fixes: #3521 #3546 

/cc @jacobvosmaer 


See merge request !1827
2015-11-19 22:57:06 +00:00
Dmitriy Zaporozhets 68d4ab2381 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 21:34:38 +00:00