home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,859 Commits 48 Branches 340 Tags
v8.1.0
Commit Graph
85 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandRobert Speicher 44d35a8225 Merge branch 'merge-request-deleted-file' into 'master' 
Correctly find last known blob for file deleted in MR.

Fixes #3092.

When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...".

See merge request !1647
 2015-10-20 18:28:15 +02:00
Douwe Maan d80a4d3c15 Merge branch 'rs-redactor-filter' into 'master' 
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects

Related: !1014

See merge request !1090
 2015-10-17 13:57:22 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Robert Speicher 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
Robert Speicher 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
Robert Speicher 1a9da9178c Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
Robert Speicher b88da58cb6 Add reference_pattern to Referable models 2015-05-26 15:48:32 -04:00
Robert Speicher 0359d41b06 Implement gfm_reference directly in Mentionable 
Except for Note, which still overrides it.
 2015-05-26 15:48:31 -04:00
Robert Speicher 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
Robert Speicher 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
Douwe Maan e739eb036d Move participants method to shared Participable concern. 2015-04-24 12:30:36 +02:00
Douwe Maan 27af24c1c9 No longer needed to pass project argument to commit methods. 2015-04-24 12:29:36 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Douwe Maan 630e879066 Clean up code somewhat. 2015-04-17 11:03:33 +02:00
Douwe Maan a9b04c4536 Fix Snippet#participants. 2015-04-15 18:59:01 +02:00
Douwe Maan 959ebbcade Clean up code around commit mentions. 2015-04-15 17:57:31 +02:00
Douwe Maan 5662b24132 Don't use HTML ellipsis in EmailsOnPush subject truncated commit message. 2015-04-14 16:32:11 +02:00
Douwe Maan e33ddfebf2 Refactor ClosingIssueExtractor. 2015-04-03 18:03:26 +02:00
Douwe Maan 65bb0c3406 Only allow users to cross-reference and close issues they have access to. 2015-04-02 10:57:01 +02:00
Douwe Maan d9698628d9 Add Commit#author and #committer. 2015-04-02 10:57:01 +02:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Ciro Santilli cd688a6011 Replace regex methods by string ones since faster 
and more readable.
 2014-12-28 23:53:27 +01:00
Jeroen van Baarsen 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
Dmitriy Zaporozhets 8c01448cf9 Dontr decoarate already decorated stuff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 17:39:29 +03:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 03b44916ba Merge pull request #7754 from Bugagazavr/hooks 
More information in merge request hook
 2014-10-03 13:37:19 +03:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev 1c9d2e39c1 Hook attributes 2014-10-02 12:58:02 +04:00
Dmitriy Zaporozhets 3695ae185b Decorate commit parents 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:19:26 +03:00
Dmitriy Zaporozhets 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
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
dosire 7795a4b90c The hard limit should be a lot more liberal, 10x seems reasonable. 2014-05-28 15:08:27 +02:00
skv-headless 2c28dbd254 commit description in commit list 2014-02-25 18:23:23 +04:00
Dmitriy Zaporozhets 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
Boyan Tabakov 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
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets 34c97a311c Increase commit title limit at Commit#show so it does not truncate most of Merge messages 2013-08-12 22:28:31 +03:00
Dmitriy Zaporozhets 49b024f5f5 Use Gitlab::Git:: for git features across application 2013-04-01 16:04:35 +03:00
Dmitriy Zaporozhets bbfbff3add Extend models functionality with old decorator methods. Use Repository model 2013-03-31 23:48:12 +03:00
Dmitriy Zaporozhets 26323046fd Decorate Gitlab::Git::Commit with Commit 2013-03-31 19:00:45 +03:00
Dmitriy Zaporozhets 154e54b46e Remove grit logic from app/ 2013-03-31 18:49:58 +03:00
Dmitriy Zaporozhets 5f9d654939 Dont show '0 additions and 0 deletions' message for commit 2013-03-21 22:50:18 +02:00
Dmitriy Zaporozhets 6347e9a60b Dont load diff in compare over 100 commits 2013-03-20 10:19:00 +02:00
Dmitriy Zaporozhets 5a214ee6f1 Remove unused methods 2013-01-05 13:11:15 +02:00
Dmitriy Zaporozhets e16cebac3e Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets 14d0ef8f37 Show images preview in notes. Show line additions/deletions for commit 2013-01-04 22:13:32 +02:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets e6c0673ef1 Rspec models Milestone, Commit, UsersProject 2013-01-03 19:11:14 +02:00