10387f6b8a
Merge branch 'master' into tmp-reference-pipeline-and-caching
...
# Conflicts:
# spec/lib/gitlab/markdown/autolink_filter_spec.rb
# spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
# spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
# spec/lib/gitlab/markdown/cross_project_reference_spec.rb
# spec/lib/gitlab/markdown/emoji_filter_spec.rb
# spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/external_link_filter_spec.rb
# spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/label_reference_filter_spec.rb
# spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
# spec/lib/gitlab/markdown/redactor_filter_spec.rb
# spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
# spec/lib/gitlab/markdown/relative_link_filter_spec.rb
# spec/lib/gitlab/markdown/sanitization_filter_spec.rb
# spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
# spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
# spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
# spec/lib/gitlab/markdown/task_list_filter_spec.rb
# spec/lib/gitlab/markdown/upload_link_filter_spec.rb
# spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
7e8fc48227
Normalize email when looking for GitLab users from commit info. #3854
2015-12-09 11:10:08 -05:00
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
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
d611a38798
Merge branch 'master' into reference-pipeline-and-caching
2015-12-07 14:48:53 +01:00
3c97cbc74c
fixes after review
2015-12-07 15:13:06 +02:00
5df2c4419c
fox specs
2015-12-07 14:14:35 +02:00
5c1b49f494
Add added, modified and removed properties to commit object in webhook
2015-12-04 16:23:21 +02:00
f3ea06eb7f
Autolink first so we don't pick up numeric anchors as issue references.
2015-12-01 15:53:32 +01:00
62c14ba2ed
Render commit reference using short sha, but include full sha in comment.
2015-12-01 12:58:45 +01:00
d6a5b45c8e
Recognize issue/MR/snippet/commit links as references.
2015-11-30 21:36:34 +01:00
c746a1de4e
Use faster, more appropriate pipeline for mentionable attributes
2015-10-22 15:40:02 +02:00
8710739e4e
Correctly find last known blob for file deleted in MR.
2015-10-20 14:24:02 +02:00
95f0440a78
Merge branch 'master' into rs-redactor-filter
2015-10-15 11:26:58 +02:00
4a5b77188e
Participable doesn't need to know about Mentionable
2015-10-14 16:20:11 +02:00
914cfbd2f1
Implement Commit Status API
2015-10-12 11:53:49 +02:00
e9b65a3e05
Only look up Commit authors/committers by email
...
- Removes looking up authors/committers by name
- Renames `User.find_for_commit` to `User.find_by_any_email`
2015-06-23 18:07:15 -04:00
33df3ed384
Add `respond_to_missing?` for Commit and Repository
...
As of Ruby 1.9, this is the correct way to handle `respond_to?` for
methods implemented by `method_missing`.
See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
2015-06-10 01:31:27 -04:00
1a9da9178c
Surround Project.reference_pattern in parenthesis inside other patterns
2015-05-26 15:49:22 -04:00
b88da58cb6
Add `reference_pattern` to Referable models
2015-05-26 15:48:32 -04:00
0359d41b06
Implement gfm_reference directly in Mentionable
...
Except for Note, which still overrides it.
2015-05-26 15:48:31 -04:00
c0faf91ff2
Add `to_reference` for models that support references
...
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
2015-05-26 15:48:30 -04:00
38cd3d6451
Add Commit#==
...
Prior, comparison would use the Ruby object's ID, which got out of sync
after a Spring fork and would result in erroneous test failures.
Now we just check that the compared object is a Commit and then compare
their underlying raw commit objects.
2015-05-26 15:48:29 -04:00
e739eb036d
Move participants method to shared Participable concern.
2015-04-24 12:30:36 +02:00
27af24c1c9
No longer needed to pass project argument to commit methods.
2015-04-24 12:29:36 +02:00
84a1590252
Let commit model know about its project.
2015-04-24 12:29:36 +02:00
630e879066
Clean up code somewhat.
2015-04-17 11:03:33 +02:00
a9b04c4536
Fix Snippet#participants.
2015-04-15 18:59:01 +02:00
959ebbcade
Clean up code around commit mentions.
2015-04-15 17:57:31 +02:00
5662b24132
Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.
2015-04-14 16:32:11 +02:00
e33ddfebf2
Refactor ClosingIssueExtractor.
2015-04-03 18:03:26 +02:00
65bb0c3406
Only allow users to cross-reference and close issues they have access to.
2015-04-02 10:57:01 +02:00
d9698628d9
Add Commit#author and #committer.
2015-04-02 10:57:01 +02:00
647ff6240e
Rubocop: Style/ElseAlignment enabled
2015-02-02 21:38:50 -08:00
cd688a6011
Replace regex methods by string ones since faster
...
and more readable.
2014-12-28 23:53:27 +01:00
4eb3c47d4e
Fixed a lot of already defined notices
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-12-14 15:13:09 +01:00
8c01448cf9
Dontr decoarate already decorated stuff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 17:39:29 +03:00
ea04ed7879
Use 8chars short sha for commit in views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 16:30:14 +03:00
200118357d
Use full commit sha width for reference in note body to prevent Ambiguous SHA1 prefix problem
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:44:27 +03:00
0189be0831
Use short_id instead of [0..N] for short version of commit sha
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
03b44916ba
Merge pull request #7754 from Bugagazavr/hooks
...
More information in merge request hook
2014-10-03 13:37:19 +03:00
2e9f5de868
Add parenthesis to function def with arguments.
2014-10-03 09:18:46 +02:00
1c9d2e39c1
Hook attributes
2014-10-02 12:58:02 +04:00
3695ae185b
Decorate commit parents
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 12:19:26 +03:00
be5b6db883
Refactor diff suppress logic and diff views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 18:28:21 +03:00
3f1ece2690
Detect closing issues in Merge Request description
2014-06-13 17:25:44 +02:00
7795a4b90c
The hard limit should be a lot more liberal, 10x seems reasonable.
2014-05-28 15:08:27 +02:00
2c28dbd254
commit description in commit list
2014-02-25 18:23:23 +04:00
ca7e4a948b
Use new tags/branches from gitlab_git
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-03 18:13:24 +02:00
01ff084a4d
Improved large commit handling.
...
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.
Related to #1745 , #2259
In addition, handle large commits for MergeRequests and Compare controllers.
Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
2013-09-07 14:44:03 +03:00
Douwe Maan
Rubén Dávila
Valery Sizov
Valery Sizov
Kamil Trzcinski
Robert Speicher
Dmitriy Zaporozhets
Ciro Santilli
Jeroen van Baarsen
Kirill Zaitsev
Jacob Vosmaer
dosire
skv-headless
Boyan Tabakov