home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,128 Commits 48 Branches 340 Tags
dddfbb653eee2037ede922ca4eafc0ca9d7b0af0
Commit Graph
2992 Commits
Author SHA1 Message Date
Stan Hu 234f4bf20f Merge branch 'fix-gitlab-workhorse-initd-check' into 'master' 
Check GitLab Workhorse status in init.d script when reporting all components are up and running

Closes https://github.com/gitlabhq/gitlabhq/issues/9869

See merge request !1969
 2015-12-06 17:36:35 +00:00
Robert Speicher d2f9a9012d Merge branch 'link-refs' into 'master' 
Recognize issue/MR/snippet/commit links as references.

Fixes #3744 and #3745

See merge request !1933
 2015-12-04 20:58:45 +00:00
Stan Hu f1fd4880d9 Check GitLab Workhorse status in init.d script when reporting all components are up and running 
Closes https://github.com/gitlabhq/gitlabhq/issues/9869
 2015-12-04 07:12:49 -08:00
Dmitriy Zaporozhets 4de7f32c60 Merge branch 'extend-events-api' 2015-12-04 13:51:30 +01:00
Dmitriy Zaporozhets 3227a5ead2 Extent Event and Note API 
* add note to Events API
* add author section to Events API
* add noteable_id and noteable_type to Notes API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 12:22:50 +01:00
Dmitriy Zaporozhets 0b68a0e79e Add API endpoint to fetch merge request commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:08:10 +01:00
Douwe Maan f9d954fae7 Satisfy rubocop 2015-12-03 19:02:56 +01:00
Douwe Maan 0de8e26066 Pass original text along with label reference filter. 2015-12-03 14:00:41 +01:00
Douwe Maan f905fd239c Use URL helpers in specs 2015-12-03 14:00:09 +01:00
Douwe Maan 928d131e39 Merge branch 'master' into link-refs 2015-12-03 13:32:42 +01:00
Valery Sizov 162cd0099c fix deprecation messages in tests 2015-12-03 10:33:43 +02:00
Douwe Maan 044e0e33dc Allow invalid URLs in closing pattern 2015-12-02 18:48:39 +01:00
Douwe Maan 60828ab40e Merge branch 'master' into link-refs 2015-12-02 12:12:03 +01:00
Douwe Maan 2f5074dc39 Expand inline docs. 2015-12-01 17:14:42 +01:00
Douwe Maan d4030a845e Pick up direct links to issues/MRs as references. 2015-12-01 16:53:07 +01:00
Douwe Maan 1d6d757dbd Allow reference format as link href 2015-12-01 16:25:56 +01:00
Douwe Maan f3ea06eb7f Autolink first so we don't pick up numeric anchors as issue references. 2015-12-01 15:53:32 +01:00
Douwe Maan 62c14ba2ed Render commit reference using short sha, but include full sha in comment. 2015-12-01 12:58:45 +01:00
Douwe Maan bd4ab21c07 Fix code docs 2015-12-01 12:49:22 +01:00
Douwe Maan f9017a2b03 Have ClosingIssueExtractor recognize all referenced issues 2015-11-30 21:36:35 +01:00
Douwe Maan d6a5b45c8e Recognize issue/MR/snippet/commit links as references. 2015-11-30 21:36:34 +01:00
Valery Sizov 13c6096e42 Merge branch 'upload_hook' into 'master' 
Fire update hook from GitLab

https://gitlab.com/gitlab-org/gitlab-ce/issues/3069

See merge request !1882
 2015-11-30 17:22:00 +00:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master' 
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
 2015-11-30 16:49:09 +00:00
Valery SizovandValery Sizov ae18ba1632 Fire update hook from GitLab 2015-11-30 18:36:34 +02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Robert Speicher f1710073b4 Fix alignment 
[ci skip]
 2015-11-27 14:39:55 -05:00
Jacob Vosmaer 04049b6b17 Fix indentation in NGINX config 2015-11-27 13:57:53 +01:00
Jacob Vosmaer 295d378e9a Repeat "client_max_body_size 0" everywhere 
It turns out that if we do not the declaration from
"location /" wins.
 2015-11-27 13:56:26 +01:00
Valery SizovandValery Sizov 7f214cee74 Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02: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
Robert Speicher ec002e8026 Remove usage of Colored 2015-11-24 19:20:23 -05: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
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
Kamil Trzcinski 11728b50f9 Expose artifacts path 2015-11-23 13:05:22 +01: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
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 Schilling 6f7e90f6db Use POST to create a new release instead of PUT 2015-11-21 18:51:41 +01: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
Marin Jankovski 899807f604 Update required version of lfs client and separate the docs for users and admins. 2015-11-20 16:10:08 +01:00
Marin Jankovski 807c1a993d Merge branch 'lfs-batch-download' into 'master' 
Add support for batch download operation

- Drops Accept for all download requests,
- Allows to do batch download for public projects and non-authorized users
- Returns 501 for legacy API with message to upgrade the client

/cc @marin @jacobvosmaer @yorickpeterse 

See merge request !1842
 2015-11-20 12:19:20 +00:00
Marin Jankovski dbc0be1b27 Error 501 when client is using deprecated API. 2015-11-20 12:45:30 +01:00
Kamil Trzcinski b8d8292bef Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:21:41 +01:00
Kamil Trzcinski 14d95b0529 Part of tests done [ci skip] 2015-11-20 11:59:32 +01:00
Dmitriy Zaporozhets b96fa3094a Merge branch 'lfs_default_and_backup' into 'master' 
Lfs default and backup

Part of gitlab-org/gitlab-ce#2955

See merge request !1823
 2015-11-20 09:10:27 +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
Kamil Trzcinski 888821f9ff Add support for batch download operation 2015-11-19 19:28:14 +01:00