home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
5424 Commits
Author SHA1 Message Date
Marin Jankovski 0f80ffdf87 Use heading instead of strong and line breaks in description. 2014-07-10 08:37:51 +02:00
Marin Jankovski d4e7db4082 Add milestone descriptions on the group show page. 2014-07-10 08:36:28 +02:00
Dmitriy Zaporozhets c337a27824 Merge branch 'browse_file' into 'master' 
Browse file

Fixes #1335

See merge request !951
 2014-07-09 15:13:00 +00:00
Marin Jankovski d6067296de Active link based on controller rather than action. 2014-07-09 11:38:29 +02:00
Marin Jankovski 91e01275cb Add tests to check for correct browse link name. 2014-07-09 10:12:09 +02:00
Marin Jankovski 6b121aa5a7 Move the links decision to helper. 2014-07-09 10:12:09 +02:00
Marin Jankovski 5d25f3d9b1 Differentiate between dirs, files and general code. 2014-07-09 10:12:08 +02:00
Marin Jankovski de22913501 Check if blob is requested. 2014-07-09 10:12:08 +02:00
Marin Jankovski 4e0afce6a7 Show browse file if we are browsing file history. 2014-07-09 10:12:08 +02:00
Dmitriy Zaporozhets 437cccf9a9 Update highlight.js to 8.1 
Also added support for less common languages. All languages from
http://highlightjs.org/download/ now supported

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-09 09:47:06 +03:00
Dmitriy Zaporozhets 22995fc932 Merge branch 'redirect_betwee_tree_and_blob' into 'master' 
Redirect between tree and blob

This checks if on requested non-existing tree path blob exists, redirects to blob path if the file exists, otherwise return not found.

See #1369

See merge request !953
 2014-07-09 06:19:18 +00:00
Dmitriy Zaporozhets 593e262e40 Fix 500 on repo archive download 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 14:55:20 +03:00
Dmitriy Zaporozhets 7bd9a702e3 Merge pull request #7222 from jhund/fix-5936 
Don't remove trailing newline when editing a file in web UI editor
 2014-07-08 09:43:23 +03:00
Dmitriy Zaporozhets 664112b47e Merge branch 'improve-email-threading' into 'master' 
Improve email threading

This is a follow-up to !112 : it improves email threading, without changing the receiver of the emails.

* Subject of answers to an existing thread begins with `Re: ` (required by Mail.app)
* Send a 'In-Reply-To' header along the 'References' header
 2014-07-07 14:06:40 +00:00
Marin Jankovski 005752e4c6 Check if blob or tree and redirect to the correct one. 2014-07-07 15:46:57 +02:00
Dmitriy Zaporozhets a5379ef9f7 Cleaner help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 10:24:57 +03:00
Dmitriy Zaporozhets 5bb2840dc4 Merge branch 'notification_when_reopened' into 'master' 
Notification when reopened issue or mr

Fixes #1396

See merge request !939
 2014-07-05 05:40:32 +00:00
Dmitriy Zaporozhets 6947d3c0ba Truncate header title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 02:03:33 +03:00
Dmitriy Zaporozhets 6a6803c2f9 Show full commit message and author name for Email on push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 17:42:11 +03:00
Dmitriy Zaporozhets d8f4c363d6 Merge pull request #7175 from jvanbaarsen/always-call-hooks 
Call every service, even if one fails
 2014-07-04 17:09:00 +03:00
Dmitriy Zaporozhets d3fcb60e43 Merge branch 'flash_message_after_signup' into 'master' 
Flash message after signup

Fixes #1366

See merge request !948
 2014-07-04 14:00:41 +00:00
Dmitriy Zaporozhets 078a4a7c4e Merge branch 'improve-ci-widget-ui' into 'master' 
Improve ci widget ui

See merge request !943
 2014-07-04 13:21:24 +00:00
Dmitriy Zaporozhets bd165421a8 Merge branch 'fix-fork-branch-removal' into 'master' 
Don't show remove branch checkbox for MR from fork

Fixes #1359

See merge request !942
 2014-07-04 13:20:59 +00:00
Dmitriy Zaporozhets 00455a478b Merge branch 'group_milestones_improvements' into 'master' 
Group milestones improvements

Fixes #1400

Fixes #1401

Fixes #1402

See merge request !946
 2014-07-04 13:20:41 +00:00
Marin Jankovski 87f89bc970 Redirect to sign in page after signup, this will show the correct flash message. 2014-07-04 14:19:59 +02:00
Marin Jankovski 3b5722bca9 Improve performance, ordering and pagination for group milestones. 2014-07-04 11:57:24 +02:00
Marin Jankovski cb69e76a29 Use correct controller name, namespacing ignored. 2014-07-04 10:49:36 +02:00
Dmitriy Zaporozhets 8395b2784a Use normal font instead of strong for ci status widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:32:46 +03:00
Dmitriy Zaporozhets d390219c6f Dont show 'Remove source brnach' checkbox for fork 
Remove source button checkbox always try to remove branch in target
project. For fork source & target projects are differents - so we hide
checkbox from UI. After MR accepted you can easily remove branch with
'Remove branch' button that do remove branch call to valid project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:22:46 +03:00
Dmitriy Zaporozhets 198c2e40b0 Fix labels showing if issue closed on search results page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-03 20:08:03 +03:00
Pierre de La Morinerie 6dafbf2412 Allow more mail clients to group emails by thread 
* send a 'In-Reply-To' header along the 'References' header
* subject of answers to an existing thread begins with 'Re: '
 2014-07-03 16:58:42 +02:00
Marin Jankovski 16068f3bfe Test if reopen notifications are sent. 2014-07-03 14:05:07 +02:00
Marin Jankovski 310231dbed Reopen mr email notification. 2014-07-03 13:40:21 +02:00
Dmitriy Zaporozhets e46ec91a94 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-03 13:52:00 +03:00
Dmitriy Zaporozhets dcd14c0af0 Merge branch 'no_notification_for_merger' into 'master' 
No notification for merger

Fixes #1378

See merge request !935
 2014-07-03 10:51:33 +00:00
Marin Jankovski 1208c6caa8 Notification for reopened issue. 2014-07-03 12:51:24 +02:00
Marin Jankovski b048c7d24a Do not notify project owner on project creation. 2014-07-03 12:02:31 +02:00
Dmitriy Zaporozhets dbeb4d7b3a Merge pull request #7250 from ahmyi/patch-1 
Content-length for Repository Archive
 2014-07-03 11:59:25 +03:00
Marin Jankovski c3533deda1 Don't notify the user that triggered the mr notification. 2014-07-03 10:26:47 +02:00
Dmitriy Zaporozhets 8d106bed3c Reopen/close buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-03 10:48:16 +03:00
Dmitriy Zaporozhets 8031be73fe Merge branch 'contributors-api' into 'master' 
Contributors api

Fixes #1266

See merge request !934
 2014-07-03 07:28:02 +00:00
Dmitriy Zaporozhets efc6baf782 Merge branch 'fix-snippet-comments' into 'master' 
Fix snippet comments

Also fixes #1209

See merge request !936
 2014-07-03 05:58:59 +00:00
ahmyi 4d051e987f Archive with content-length header 2014-07-03 11:05:51 +08:00
ahmyi dce6cb2d84 Content-length defined in header response 
Enable Content-Length to be defined in header response
 2014-07-03 10:57:01 +08:00
Marin Jankovski f50c7ecadc Remove new lines. 2014-07-02 19:09:27 +02:00
Dmitriy Zaporozhets 3decd46269 Better UI for closed/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 20:05:36 +03:00
Dmitriy Zaporozhets 75e903c08b Fix project snippet comments loading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 19:53:41 +03:00
Dmitriy Zaporozhets a27c336ec8 Merge branch 'assignement_change_notifications' into 'master' 
Assignment change notifications

Fixes #1377
 2014-07-02 16:25:17 +00:00
Dmitriy Zaporozhets 30b729195b Merge branch 'reference_merge_request_in_commit_message' into 'master' 
Add reference to the merge request in the default merge request commit message

This adds a link to the merge request to the merge request commit.

If merge requests are used for code review, the merge in git is now linked to the code review.

See http://feedback.gitlab.com/forums/176466-general/suggestions/6088000-in-the-default-merge-request-commit-message-add-a
 2014-07-02 16:22:08 +00:00
Marin Jankovski bc7656a306 Do not notify person who merged the MR. 2014-07-02 16:38:03 +02:00