home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,700 Commits 48 Branches 340 Tags
d9cb3ffaf03706877e4d58894ce89c1b9f7fb708
Commit Graph
703 Commits
Author SHA1 Message Date
Marin Jankovski ced2438312 Clean the string with commit author and email. 2014-11-14 11:08:58 +01:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master' 
Actions in the inbox

Related to #1607

See merge request !1247
 2014-11-12 14:57:38 +00:00
Dmitriy Zaporozhets c58edd7c70 Merge branch 'add_issue_edited_timestamp' into 'master' 
Add issue edited timestamp

Comments already have this feature.
So, I think, issues should also have it.
![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png)

See merge request !235
 2014-11-12 11:02:25 +00:00
Marin Jankovski 857852ce04 Set action on issue/mr creation mail. 2014-11-12 11:59:57 +01:00
Marin Jankovski af15447867 Create emails helper for actions links. 2014-11-11 16:09:58 +01:00
Ben Bodenmiller 6ace931c35 make repo name link to repo homepage 2014-11-09 03:37:56 -08:00
Nikita Verkhovin 2148e1997a Add issue edited timestamp 2014-11-08 16:54:08 +06:00
Ciro Santilli a56d0d47db Remove unneeded backslash: "\/" == "/" 2014-11-04 11:16:53 +01:00
Jan-Willem van der Meer a7e071e982 Add refactoring for multiple LDAP server support 
These changes are ported from EE to CE. Apply changes for app directory
 2014-10-13 13:39:54 +02:00
Dmitriy ZaporozhetsandJan-Willem van der Meer a756fd1ff6 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 13:01:57 +02:00
Vinnie Okada b3c70d001d Improve dashboard note view and add tests 
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
 2014-10-12 23:56:56 -05:00
Vinnie Okada 5b2a42a091 Preserve link href in truncated note view 
Notes on the dashboard views are truncated to 150 characters; this
change ensures that when a link's text is truncated it still points to
the correct URL.
 2014-10-12 14:52:17 -05: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
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets 74217f753f Apply ConfirmDangerModal for project transfer/remove actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 13:57:54 +03:00
Dmitriy Zaporozhets ac7fab7311 Merge pull request #7938 from cirosantilli/factor-dashboard-helper 
Factor dashboard helper methods.
 2014-10-08 11:38:22 +03:00
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about 
Replace www.gitlab.com with about.gitlab.com
 2014-10-08 09:46:51 +02:00
Dmitriy Zaporozhets 8fad7e63a3 Add a bit of space between star icon and text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 15:22:55 +03:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Dmitriy Zaporozhets 7bcd6f79a4 Merge pull request #7963 from cirosantilli/factor-previewable 
Factor markup? || gitlab_markdown? into new method
 2014-10-07 12:19:28 +03:00
Dmitriy Zaporozhets 299114948b Use only escaped auto_link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 15:15:39 +03:00
Dmitriy Zaporozhets 274e7951f6 Merge pull request #7379 from cirosantilli/remove-title 
[minor-refactor] Remove unused title parameter on merge request creation helper.
 2014-10-06 11:55:43 +03:00
Ciro Santilli 07e9cb6b77 Factor markup? || gitlab_markdown? into new method 2014-10-04 17:56:12 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Ciro Santilli da99560ecb Factor dashboard helper methods. 2014-10-02 14:07:21 +02:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline 
Factor out Emoji parsing using html-pipeline-gitlab
 2014-10-02 11:18:40 +03:00
Robert Schilling 390183a426 Factor out Emoji parsing using html-pipeline-gitlab 2014-09-26 01:32:33 +02:00
Dmitriy Zaporozhets 16d530b7b0 Sort projects in search autocomplete by amount of stars. Most popular go first 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 19:41:49 +03:00
Dmitriy Zaporozhets 79a4da907d Merge pull request #7816 from cirosantilli/factor-fork 
Factor fork button view.
 2014-09-24 12:41:16 +03:00
Ciro Santilli b5c0bdd7c9 Factor fork button view. 2014-09-23 21:16:27 +02:00
Dmitriy Zaporozhets 6e328d5590 Merge pull request #7793 from cirosantilli/replace-javascript 
Replace javascript:; links with buttons.
 2014-09-23 21:28:35 +03:00
Dmitriy Zaporozhets 1e980ffbad Prevent 500 error on search results if description contains relative link 2014-09-23 17:56:41 +03:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Dmitriy Zaporozhets 6a1323f12a Merge pull request #7792 from cirosantilli/link_to_reply_diff 
Fix link_to_reply_diff.
 2014-09-22 21:02:43 +03:00
Ciro Santilli 9439602edc Fix link_to_reply_diff. 2014-09-19 14:15:24 +02:00
Dmitriy Zaporozhets 4a21db82ec Merge branch 'first-meaningful-line-in-md' of https://github.com/yglukhov/gitlabhq into 7-4-pre 2014-09-17 21:37:34 +03:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
uran 02eca79ef1 Changed activity notes to display first MEANINGFUL line. 2014-09-12 14:22:15 +03:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Marin Jankovski 2ff83aa389 Fix typo. 2014-09-09 11:52:16 +02:00
Marin Jankovski ac6a107ac7 Add line code to parallel diff for linking. 2014-09-09 11:36:29 +02:00
Marin Jankovski 9c3935c5b0 Use the new path to the partial, move the diff related methods to the new helper. 2014-09-09 11:10:40 +02:00
Dmitriy Zaporozhets 02e87d9223 optimize show_diff_size_warning? 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:12:54 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Marin Jankovski 23706716fc Now refactor all to work properly. 2014-09-08 09:05:17 +02:00
Marin Jankovski 721b75733c Take the next type into consideration 2014-09-08 09:05:17 +02:00