home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
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
Marin Jankovski 12f696c23e Remove unecessary return. 2014-07-02 16:02:26 +02:00
Dmitriy Zaporozhets 767bd78081 Use Contributor class instead of hash 2014-07-02 15:09:06 +03:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Marin Jankovski 39f82b75f5 When assigning an unassigned issue send notification with the correct text. 2014-07-02 11:55:05 +02:00
Dmitriy Zaporozhets 119b02877d Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master' 
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed

This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
 2014-07-02 07:00:16 +00:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets f3b31c4c5b Merge pull request #6629 from sykano/fix-project-limit-for-groups 
fix for project creation: group projects don't count towards user's project limit
 2014-07-02 09:56:24 +03:00
Takashi AOKI 1057251150 fix high cpu usage issue that occured in Firefox 
fixes issue related with #342 (Merge Request view causes 100% CPU in firefox)
 2014-07-02 12:57:30 +09:00
Christian Taedcke c1b7e904ff Add a mention of the merge request into its default commit message. 2014-07-01 21:54:19 +02:00
Kyle Fazzari 1f976a646d Updated ATOM feed partials to use markdown instead of simple_format. 2014-07-01 06:29:58 -07:00
Dmitriy Zaporozhets 4e1f9e2b8b Merge branch 'issue_strong_param' into 'master' 
Issue strong param

Fixes #1390
 2014-07-01 13:01:42 +00:00
Dmitriy Zaporozhets 57f1ff5dc0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-01 15:58:09 +03:00
Marin Jankovski 815fbbbf91 Add title html option to issue and mr links in milestones to show title on hover. 2014-07-01 14:16:37 +02:00
Marin Jankovski 751d267f29 Create required issue param for new action. 2014-07-01 14:03:49 +02:00
Dmitriy Zaporozhets b88401c9aa Merge branch 'mail_template' into 'master' 
Mail template changes (add the command line for http) when a project is moved in an other namespace.

See subject, it is just the addition of the set-url for http(s) origin in the mails.
 2014-07-01 11:48:47 +00:00
Dmitriy Zaporozhets f71e68dcad Merge branch 'images-in-emails' into 'master' 
Limit the width of images in emails

In notification emails, large inline images can exceed the width of the viewport. This ensure that large images are resized to fit within the mail client window.
 2014-07-01 11:47:50 +00:00
Dmitriy Zaporozhets f12967ced7 Merge branch 'bugfix/304/dashboard_feed_note_urls' into 'master' 
Fix Dashboard Feed URLs For Notes

This MR fixes issue #304 by updating the app/helpers/events_helper.rb event_feed_url() function to also return a URL for the various types of notes. Without this change, no URL is returned, which causes any note events on the feed to link directly back to the feed.
 2014-07-01 11:46:23 +00:00
Dmitriy Zaporozhets 5be5b23f43 Merge branch 'css-fix' into 'master' 
CSS fix: 1px border on hover of last item in tree view

I messed up my fork repository and hat to recreate it. So I closed MR !77 and created this one instead. Sorry for any inconvenience.

@dzaporozhets: I changed the code and just added one line as you suggested.

This merge request fixes issue #101.
 2014-07-01 11:42:27 +00:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master' 
Group milestones
 2014-07-01 07:18:15 +00:00
Dmitriy Zaporozhets bcfcd243a6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-30 20:06:23 +03:00
Dmitriy Zaporozhets 4f0bfdb500 Merge branch 'strong-parameters' into 'master' 
Strong parameters

Replace protected_attributes with strong parameters.
Fixes #1340
 2014-06-30 17:01:22 +00:00
Marin Jankovski 3e52517da1 Add feature tests for group milestone. 2014-06-30 16:18:26 +02:00
Dmitriy Zaporozhets 4967c08786 Fix signup and project visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 16:43:32 +03:00
Marin Jankovski fdbf77ef99 Fix styling issues. 2014-06-30 13:27:17 +02:00
Marin Jankovski d3796b84f8 Show all issues and merge requests that could be considered opened or closed, includes reopened and merged. 2014-06-30 12:41:27 +02:00
Marin Jankovski d145f09cd6 Correct authorization for group milestones. 2014-06-30 11:38:03 +02:00
Marin Jankovski e66a8b4cda Move milestone link in group head, 2 column milestone for MR and issues. 2014-06-30 11:13:24 +02:00