Commit Graph
20754 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cbaa33db8a Small code improvement
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-24 17:40:41 +01:00
Dmitriy Zaporozhets cb9f573818 Fix rubocop complain
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-24 16:17:11 +01: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 9ab2e5f516 Merge branch 'fix-small-text' into 'master'
Fix ultra-light color for small text

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

See merge request !1879
2015-11-24 13:23:33 +00: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
Dmitriy Zaporozhets 8c0f2acad9 Merge branch 'service-tests' into 'master'
Add tests for (Create|Update)ReleaseService

As promised 

See merge request !1875
2015-11-24 10:04:39 +00: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 62303bfad1 Update CHANGELOG
[ci skip]
2015-11-23 16:51:16 -05: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
Robert Schilling e4f3d05c74 Add tests for (Create|Update)ReleaseService 2015-11-23 18:35:16 +01:00
Dmitriy Zaporozhets 36f7b624be Merge branch 'bundler-audit' into 'master'
Add bundler-audit to CI

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

cc @DouweM @rspeicher @vsizov 

See merge request !1874
2015-11-23 15:51:39 +00:00
Dmitriy Zaporozhets f84fb81970 Merge branch 'required_version_and_docs_update' into 'master'
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
2015-11-23 14:47:35 +00:00
Dmitriy Zaporozhets b6ed935dcd Allow bundler:audit to fail
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-23 15:45:16 +01:00
Dmitriy Zaporozhets 200c82adad Fix gitlab-ci.yml syntax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-23 15:27:34 +01:00
Dmitriy Zaporozhets 7ac112d8e8 Add few fixes to documentation based on comments from review
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-23 15:18:59 +01:00
Dmitriy Zaporozhets 091b879ce0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-23 15:04:47 +01:00
Dmitriy Zaporozhets 93f32b25d2 Add bundler-audit to CI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-23 14:57:41 +01:00
Dmitriy Zaporozhets c35d3c43d8 Merge pull request #9843 from ferdinandrosario/upgrade
Updated rails patch
2015-11-23 14:46:49 +01: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
Robert Speicher 732c2d15d2 Update doc/release/patch.md with more current patch procedures
[ci skip]
2015-11-22 18:24:53 -05: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
Kamil Trzciński 319808fc7b Merge branch 'ci-doc-yaml' into 'master'
Fix CI yaml syntax documentation [ci skip]



See merge request !1866
2015-11-21 19:26:48 +00:00
Kamil Trzcinski f2318dfc9e Fix CI yaml syntax documentation [ci skip] 2015-11-21 20:25:07 +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 c502695fdb Add award_emoji.png doc image
[ci skip]
2015-11-21 13:15:51 -05:00
Robert Schilling 6f7e90f6db Use POST to create a new release instead of PUT 2015-11-21 18:51:41 +01: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
Robert Schilling 2cba93a0d2 Make tag API consistent for release feature 2015-11-21 17:29:26 +01:00
Robert Speicher e2d5f9a83a Merge branch 'award-emoji-doc' into 'master'
Use award emoticons in GitLab workflow

Remove the old voting slides and use the emoji bar.

[ci skip]

See merge request !1863
2015-11-21 16:08:12 +00:00
Robert Schilling c113e23489 Use award emoticons in GitLab workflow [ci skip] 2015-11-21 16:50:37 +01:00
Robert Speicher 4427e80fb5 Merge branch 'api-tags-doc' into 'master'
Add tags page to readme

The tags page was separated for the release feature but not to the index readme.

[ci skip]

See merge request !1861
2015-11-21 15:50:31 +00:00
Robert Schilling ca735446ef Add tags page to readme [ci skip] 2015-11-21 12:13:30 +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