home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,609 Commits 48 Branches 340 Tags
593e262e40329d2feb9bea1592c4ee7b6bcefac2
Commit Graph
10609 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 85a15b0e22 Merge pull request #7152 from bhuisgen/master 
Fix LDAP TLS authentication
 2014-07-08 09:44:29 +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 715b8181ef Merge pull request #7273 from whitesheep/patch-1 
gitlab-shell
 2014-07-08 09:42:09 +03:00
Marco Rondini e97834567b gitlab-shell 
version change
 2014-07-07 21:32:46 +02:00
Dmitriy Zaporozhets 3cb99017c7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-07 17:07:27 +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
Dmitriy Zaporozhets 5a67d482af Merge branch 'sanitize_rake_check_output' into 'master' 
Sanitize rake check output

Fixes #1206

See merge request !952
 2014-07-07 13:33:11 +00:00
Marin Jankovski cb4d8eff4c Add sanitize option to documentation. 2014-07-07 14:41:02 +02:00
Marin Jankovski 553f3aba48 Remove duplicated calls. 2014-07-07 14:19:32 +02:00
Marin Jankovski 4c68d2387e Add sanitize option to gitlab check rake task. 2014-07-07 14:12:06 +02:00
Dmitriy Zaporozhets d5a8f9ccca Merge branch 'cleaner-help-page' into 'master' 
Cleaner help page

Focus on documentation. Move quick help section to right. Remove unnecessary styling

See merge request !950
 2014-07-05 08:16:07 +00: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 fe2cb593f9 Improve markdown doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 08:52:43 +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 87eda15b7b Merge branch 'email-service-full-commit-message' into 'master' 
Show full commit message and author name for Email on push service

Fixed #1305

![Screenshot 2014-07-04 17.42.47](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/55696faea6/Screenshot_2014-07-04_17.42.47.png)

See merge request !949
 2014-07-04 19:22:01 +00: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 c8ac0ab392 Merge pull request #7208 from MrMarvin/ce_rake_cleanup_ldap_users 
Adds rake task to clean up deleted LDAP users
 2014-07-04 17:10:06 +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
Dmitriy Zaporozhets 7aa8bfc1c7 Merge branch 'correct_active_link' into 'master' 
Correct active link for group milestones

Fixes #1399

See merge request !945
 2014-07-04 13:19:38 +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
Sytse Sijbrandij 1b76554125 Merge branch 'fix_for_public_access_doc' into 'master' 
Fix for public access doc

See merge request !947
 2014-07-04 11:28:00 +00:00
Marin Jankovski ddb8c8e0d6 Link to permissions doc using relative path. 2014-07-04 13:15:36 +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 83fd03f2dd Merge branch 'closed-in-search' into 'master' 
Fixed labels for closed issues/mr in search results

See merge request !941
 2014-07-03 18:26:37 +00: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
Dmitriy Zaporozhets 7bff1dc92f Merge branch 'no_notification_for_project_creator' into 'master' 
No notification for project creator

Fixes #1378

See merge request !937
 2014-07-03 10:51:13 +00:00
Dmitriy Zaporozhets ebde3e35ca Merge branch 'no_need_for_creating_satellites' into 'master' 
No need for creating satellites

Satellites are created automatically now.

See merge request !905
 2014-07-03 10:47:58 +00:00
Jacob Vosmaer 4e894b1dd5 Satellites are created automatically now 2014-07-03 12:24:53 +02:00
Sytse Sijbrandij efc09c8c48 Merge branch 'use_gitlab_db_converter' into 'master' 
Use the correct clone link for the DB converter

See merge request !938
 2014-07-03 10:21:38 +00:00
Jacob Vosmaer 43b05afc4d Use the correct clone link for the DB converter 2014-07-03 12:17:46 +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