home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 14:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
4716 Commits
Author SHA1 Message Date
Douwe Maan 0520cd7164 Merge branch 'master' into ui/form-consistency 2015-12-03 13:21:19 +01:00
Dmitriy Zaporozhets b4b67b020a Merge branch 'deprecated_warnings' into 'master' 
Git rid of deprecated warnings after rails update

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

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

See merge request !1946
 2015-12-03 09:41:15 +00:00
Valery Sizov 162cd0099c fix deprecation messages in tests 2015-12-03 10:33:43 +02:00
Rubén DávilaandValery Sizov f94afdbdb2 Fix broken spec related to MySQL and fractional seconds support. 2015-12-03 09:30:50 +02:00
Douwe Maan 044e0e33dc Allow invalid URLs in closing pattern 2015-12-02 18:48:39 +01:00
Douwe Maan 67119e15c0 Use consistent casing for form field labels 2015-12-02 14:41:54 +01:00
Andrew Tomaka daca985a6e Prevent impersonation if blocked 2015-12-02 08:07:29 -05:00
Zeger-Jan van de Weg a7682f8775 Specs for 'Merge When Build Succeeds' 2015-12-02 13:27:16 +01:00
Douwe Maan 60828ab40e Merge branch 'master' into link-refs 2015-12-02 12:12:03 +01:00
Douwe Maan 2955ca613b Merge branch 'master' into reference-pipeline-and-caching 2015-12-02 11:20:51 +01:00
Douwe Maan 9aac53bcee Satisfy Rubocop 2015-12-02 10:54:24 +01:00
Douwe Maan c07f0fa735 Add new references to markdown feature spec. 2015-12-01 17:04:32 +01:00
Douwe Maan d4030a845e Pick up direct links to issues/MRs as references. 2015-12-01 16:53:07 +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
Stan Hu a518879a6f Merge pull request #9868 from yms9654/commit-without-whitespace 
Add ignore whitespace change option to commit view
 2015-12-01 00:30:39 -08:00
Minsik Yoon 8c4a3c77d8 Add ignore whitespace change option to commit view 2015-12-01 09:51:10 +09:00
Douwe Maan 4a0ebccf6b Fix specs 2015-11-30 22:43:54 +01:00
Douwe Maan bf5e7252ee Recognize commit range with named refs in compare URLs. 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
Douwe Maan a7be01cd07 Render commit range reference with short shas, link to full shas. 2015-11-30 21:10:52 +01:00
Robert Speicher 244c9a00e0 Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal' 
See merge request !1916
 2015-11-30 12:00:13 -05: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 Sizov f1504e1ad5 test fix 2015-11-30 18:03:07 +02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Dmitriy Zaporozhets f41634c7f6 Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' 
Show Gmail actions links only on expected set of emails



See merge request !1901
 2015-11-30 09:23:56 +00:00
Valery Sizov 461731f076 fix notification_service specs 2015-11-30 11:21:10 +02:00
Douwe Maan 8f4b6d51f0 Merge branch 'jcorcuera/gitlab-ce-issue_3428' 2015-11-27 12:53:10 +01:00
Stan Hu 312e3b1e16 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2015-11-26 08:14:10 -08:00
Stan Hu 2f90e71fd3 Merge pull request #9670 from janten/gravatar-retina 
Add support for HiDPI displays in gravatar service
 2015-11-26 08:13:28 -08:00
Jose Corcuera b9df1a6355 Strip attributes for Milestone and Issuable. #3428 2015-11-26 10:16:50 -05:00
Stan Hu 2497d3d550 Fix 404 in redirection after removing a project 
Closes https://github.com/gitlabhq/gitlabhq/issues/9844

Closes #3559
 2015-11-25 23:11:35 -08:00
Douglas Barbosa Alexandre 8dcef120cd Fix raw private snippets access workflow 2015-11-25 18:16:27 -02:00
Marin Jankovski 5c0be319cc Remove some repetition in notify spec. 2015-11-25 13:59:03 +01:00
Marin Jankovski 7da750cc30 Specs for links in email notifications for Gmail Actions. 2015-11-25 13:27:31 +01: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 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
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
Ted Hogan 6e6a99061d No space required after WIP identifier 
Modified changelog
 2015-11-23 11:52:43 -07:00
Robert Schilling e4f3d05c74 Add tests for (Create|Update)ReleaseService 2015-11-23 18:35:16 +01: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
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
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 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
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