Commit Graph
22678 Commits
Author SHA1 Message Date
Robert Speicher 437679ec45 Merge branch 'rebase-use-shared' into 'master'
Use the 'shared' directory for MR rebasing

See merge request !62
2015-11-27 19:49:41 +00:00
Jacob Vosmaer 7827f99e50 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into rebase-use-shared 2015-11-26 13:44:29 +01:00
Valery Sizov a9b8612818 Merge branch 'ce_upstream' into 'master'
CE upstream



See merge request !64
2015-11-26 08:01:23 +00:00
Yorick Peterse a48614c45a Port 8-2-stable-ee changes for ProjectsFinder 2015-11-25 15:44:19 +01:00
Valery Sizov cf3d78e5d7 specs fixing 2015-11-25 16:31:22 +02:00
Valery Sizov f208dd007a specs fix 2015-11-25 14:35:47 +02:00
Dmitriy Zaporozhets 4781a626a9 Merge branch 'issue_280' into 'master'
Discourage users from clicking 'Clear LDAP permission cache'.

Reference: https://dev.gitlab.org/gitlab/gitlab-ee/issues/280

See merge request !61
2015-11-24 18:33:15 +00:00
Robert Speicher 80a12e642a Merge branch 'license-as-key' into 'master'
Allow license to be uploaded as text rather than file

RE gitlab-com/www-gitlab-com#423

See merge request !63
2015-11-24 17:58:18 +00:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Rubén Dávila 1278a1fb29 Discourage users from clicking 'Clear LDAP permission cache'. #280 2015-11-24 10:48:05 -05:00
Douwe Maan 531f3ac462 Allow license to be uploaded as text rather than file 2015-11-24 15:55:02 +01:00
Jacob Vosmaer b895a2e3b0 Use the 'shared' directory for MR rebasing 2015-11-24 14:22:23 +01:00
Valery Sizov 3eb15786e9 Merge remote-tracking branch 'ee_com/8-2-stable-ee' into ce_upstream 2015-11-24 15:00:14 +02: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 c2d03df846 Merge branch 'flog' into 'master'
Reduce method complexity in AutocompleteController



See merge request !58
2015-11-23 16:33:59 +00: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 07140614ca Version 8.2.0-ee 2015-11-21 23:38:05 -05:00
Robert Speicher 698455466a Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 23:13:20 -05:00
Robert SpeicherandRobert Speicher dbcd646296 Merge branch 'award_fix' into 'master'
Emoji bug: Invalid url to image

Closes #3591

See merge request !1868
2015-11-21 23:11:45 -05: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
Dmitriy ZaporozhetsandRobert Speicher aeaa5b5037 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 22:53:08 -05:00
Robert SpeicherandRobert Speicher 94b33caf84 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-21 22:46:18 -05: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
Stan HuandRobert Speicher 27821ce01f 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:38:13 -05: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