Grzegorz Bizon
e2f937ce22
Refactor RepositoryPush, move to Message namespace
2015-12-08 08:43:08 +01:00
Grzegorz Bizon
8c6db54e12
Extract repository_push_email to separate class
2015-12-08 08:43:08 +01:00
Valery Sizov
bd5fb1b479
Merge branch 'webhook_payload_with_changes' into 'master'
...
Add added, modified and removed properties to commit object in webhook
https://gitlab.com/gitlab-org/gitlab-ee/issues/20
See merge request !1988
2015-12-07 14:43:13 +00:00
Valery Sizov
3c97cbc74c
fixes after review
2015-12-07 15:13:06 +02:00
Valery Sizov
5df2c4419c
fox specs
2015-12-07 14:14:35 +02:00
Valery Sizov
5c1b49f494
Add added, modified and removed properties to commit object in webhook
2015-12-04 16:23:21 +02: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 and Valery 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
Valery Sizov and Valery Sizov
7f214cee74
Migrate mailers to ActiveJob
2015-11-26 17:03:43 +02: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
Kamil Trzcinski
11728b50f9
Expose artifacts path
2015-11-23 13:05:22 +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
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
Kamil Trzcinski
888821f9ff
Add support for batch download operation
2015-11-19 19:28:14 +01:00
Yorick Peterse
a42d469ab2
Merge branch 'atom-feed-latest-update' into 'master'
...
Improve performance of user profiles, finding groups, and finding projects
This MR improves the following:
* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)
Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.
See merge request !1790
2015-11-19 10:05:53 +00:00
Douwe Maan
c7fde6a0d8
Merge branch 'ce-mirror-backport' into 'master'
...
Backport relevant changes from gitlab-org/gitlab-ee!51
To do:
- [x] Update gitlab-shell
See merge request !1822
2015-11-18 14:56:29 +00:00
Yorick Peterse
9eefae6917
Fix UNION syntax for MySQL
...
Apparently MySQL doesn't support this syntax:
(...) UNION (...)
instead it only supports:
...
UNION
...
2015-11-18 13:31:18 +01:00
Yorick Peterse
d769596aec
Added Gitlab::SQL::Union class
...
This class can be used to join multiple AcitveRecord::Relation objects
together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't
support UNION and existing Gems out there don't handle prepared
statements (e.g. they never incremented the variable bindings).
2015-11-18 13:02:43 +01:00
Douwe Maan
fe8bb1f196
Merge pull request #9838 from evindor/master
...
Fix github importer to handle empty issues
2015-11-18 12:14:55 +01:00
Arseny Zarechnev
e809669383
Fix github importer to handle empty issues
2015-11-18 11:02:25 +00:00
Douwe Maan
841a7c6897
Store and show reason why import failed.
2015-11-18 12:00:56 +01:00
Dmitriy Zaporozhets
49e32cb59f
Remove small code duplication in user_reference_filter.rb
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-17 12:55:16 +01:00
Dmitriy Zaporozhets
79fa6c646c
Remove duplication in reference filters
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-16 23:56:16 +01:00
Marin Jankovski
14032d8eb1
Add support for git lfs.
2015-11-16 12:39:13 +01:00
Alec Cooper
4bb99677b1
Relative links in the README file shown on the repository homepage should point
...
to the default branch, not to master
2015-11-14 15:00:55 -05:00
Dmitriy Zaporozhets
f197b528ff
Merge branch 'refactor-complex-methods' into 'master'
...
Refactor complex methods
Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50
Part of #3444
See merge request !1794
2015-11-13 11:48:40 +00:00
Dmitriy Zaporozhets
3c16fb93fc
Move spec to proper place and fix unused variable
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-13 09:45:21 +01:00
Minsik Yoon and 윤민식
3d0efa8e0a
Add ignore white space option in merge request diff
...
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393 ).
Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets
c71892e1a8
Even more refactoring to inline_diff.rb
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-13 01:07:33 +01:00
Dmitriy Zaporozhets
c903f23f3c
Split complex methods in GoogleCodeImport::Importer
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-13 00:55:20 +01:00
Dmitriy Zaporozhets
ea6a78ef5c
Split complex Gitlab::InlineDiff::processing method
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-13 00:44:16 +01:00