home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,152 Commits 48 Branches 340 Tags
de90b572d8f22708ea76ffbea9c513143fdeea2e
Commit Graph
10152 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre de La Morinerie de90b572d8 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: ’

This fixes threading with at least Mail.app and Airmail.
 2014-06-10 17:09:15 +02:00
Pierre de La Morinerie 466b768bb3 Send notification emails to the "project", and put people in Cc 
This fixes email threading in Mail.app, that doesn't like when a thread
doesn't have stable recipients.

For instance, here is a possible sender-recipient combinations before:

From: A
To: Me
New issue

From: B
To: Me
Reply on new issue

From: A
To: Me
Another reply

Mail.app doesn't see B as a participant to the original email thread,
and decides to break the thread: it will group all messages from A
together, and separately all messages from B.

This commit makes the thread look like this:

From: A
To: gitlab/project
Cc: Me
New issue

From: B
To: gitlab/project
Cc: Me
Reply on new issue

From: A
To: gitlab/project
Cc: Me
Another reply

Mail.app sees a common recipient, and group the thread correctly.
 2014-06-10 17:09:15 +02:00
Sytse Sijbrandij 772f2f1ac8 Merge branch 'https_documentation' into 'master' 
Https in installation document
 2014-06-10 12:32:25 +00:00
Marin Jankovski fa9c39591c Extract gitlab-shell configuration note to gitlab-shell section. 2014-06-10 12:57:50 +02:00
Dmitriy Zaporozhets 476cd0f763 Merge branch 'commit-count' into 'master' 
Project commit count for default branch

Currently, the commit count displayed on a project's home page shows the total number of commits on the master branch. This can lead to situations in which a project may have no commits reported or very few if the project workflow does not involve the use of a branch named "master". Since number of commits can be an indicator of project health, showing 0 commits could make it harder to encourage adoption of a project.

This MR alters the repository model's `commit_count` method to return the count for the default branch instead of master.

See issue #299
 2014-06-10 09:59:54 +00:00
Marin Jankovski b980ab407e Update installation doc to mention using https. 2014-06-10 11:58:11 +02:00
Dmitriy Zaporozhets 8e5a0b6e92 Merge branch 'master' into 'master' 
Fix typo in CHANGELOG
 2014-06-10 09:51:45 +00:00
Dmitriy Zaporozhets 1687095db6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-10 12:40:28 +03:00
Dmitriy Zaporozhets c4c877e433 Merge branch 'milestone-change-note' into 'master' 
Create a note when issue milestone was changed

Part of #1207
 2014-06-10 09:40:10 +00:00
Dmitriy Zaporozhets f2353352a2 Test for milestone changed comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:39:48 +03:00
Dmitriy Zaporozhets d205292552 Merge branch 'gitlab_shell_version_file' into 'master' 
Gitlab shell version file
 2014-06-10 09:35:34 +00:00
Dmitriy Zaporozhets 55440ac9be Make a comment to MR whne milestone was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:33:17 +03:00
Dmitriy Zaporozhets 525fa6c11b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:29:23 +03:00
Dmitriy Zaporozhets 7edf65d1ee Make a system comment when issue milestone changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:25:43 +03:00
Marin Jankovski dca6c490cc Update check task and add to monthly release doc lines about gitlab_shell_version file. 2014-06-10 11:16:47 +02:00
Dmitriy Zaporozhets 03587abca0 Merge branch 'update_installation_doc_python_docutils' into 'master' 
Update installation doc with python-docutils

Fixes #1293
 2014-06-10 08:43:15 +00:00
Marin Jankovski 3affaa9b98 Add python-docutils to dependency list. 2014-06-10 10:40:28 +02:00
Marin Jankovski 6384344f15 Add gitlab shell version file. 2014-06-10 10:00:12 +02:00
Dmitriy Zaporozhets a93ae9dc61 Merge pull request #7043 from jvanbaarsen/update-installation-dox 
We need to change config in step 5
 2014-06-09 22:12:45 +03:00
Dmitriy Zaporozhets f055bad513 Merge pull request #7095 from jvanbaarsen/routing-spec-fix 
Fix for the broken routing specs
 2014-06-09 12:26:46 +03:00
Dmitriy Zaporozhets 9e78fb5bf7 Merge pull request #7094 from jvanbaarsen/project-team-spec-fix 
Fixed the project team specs
 2014-06-09 12:26:32 +03:00
Dmitriy Zaporozhets 880a86b577 Merge pull request #7093 from jvanbaarsen/spex-fix-notifications-helper 
Fixed some broken specs
 2014-06-09 12:25:23 +03:00
Jeroen van Baarsen f07f524bad Fix for the broken routing specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:42:09 +02:00
Jeroen van Baarsen a705d194fa Fixed the project team specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:36:09 +02:00
Jeroen van Baarsen 597836d6cc Fixed some broken specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:27:57 +02:00
Michael Grosser 95b786ff79 Fix typo 2014-06-07 16:39:48 +00:00
Dmitriy Zaporozhets 7a89cef601 Merge pull request #7092 from jvanbaarsen/tmp-fix-for-rspec 
Temp fix for rspec so the specs are run again
 2014-06-07 17:12:17 +03:00
Dmitriy Zaporozhets 4dcf2f1c2d New entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:55:31 +03:00
Dmitriy Zaporozhets 9a2fec5273 Merge branch 'public-profile-info' into 'master' 
Public profile info

Show small info about your profile being publicly because you joined public project![Screenshot 2014-06-07 15.17.17](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/eecf9a0bdc/Screenshot_2014-06-07_15.17.17.png)

Fixes #1321
 2014-06-07 12:51:00 +00:00
Dmitriy Zaporozhets bcea7ba331 Merge branch 'namespace-route' into 'master' 
Namespace route

Fixes #1312
 2014-06-07 12:50:45 +00:00
Dmitriy Zaporozhets 0d13abb1c8 Specify language detection for highlight.js 
Because I am tired of CHANGELOG highlighted as sql file :)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:46:58 +03:00
Dmitriy Zaporozhets 98d697a1a6 Show small notice at profile page about publicity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:18:01 +03:00
Dmitriy Zaporozhets 3dc0bce947 Add users to /:id route 
So now when you type site/:username it redirects you to users page.
And if you type site/:groupname it redirects you to group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:06:55 +03:00
Jeroen van Baarsen 2838a993da DB cleaner reverted to a known working version 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-07 10:09:56 +02:00
Dmitriy Zaporozhets ab094e67ee Merge branch 'faster-diff-rendering' into 'master' 
Faster diff rendering

1. Dont render link in separate template but use helper instead
2. Don't build new object but just reuse variables

New note for diff is rendered per each diff line. Such simple improvements gives us 20..100% better performance depends on diff size
 2014-06-06 20:43:23 +00:00
Dmitriy Zaporozhets 2aef3b00cf Refactor link to new diff note rendering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 23:15:54 +03:00
Dmitriy Zaporozhets bc6a17a682 Smaller event width for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:33:52 +03:00
Dmitriy Zaporozhets 910a99f90b Improve tree view for mobile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:21:07 +03:00
Dmitriy Zaporozhets dd03841fea Make visibility icon more noticable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:09:52 +03:00
Dmitriy Zaporozhets 71d074a674 Use same color for icon, arrow and project title on dash sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:06:04 +03:00
Dmitriy Zaporozhets d325a279fb Small UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 22:01:34 +03:00
Dmitriy Zaporozhets 34d9f34a61 Improve select2 css to match bootstrap style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 21:39:30 +03:00
Jeroen van Baarsen 7cf1a4259a Disable fixtures 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-06 19:55:49 +02:00
Dmitriy Zaporozhets 838bbb55e5 Use bootstrap default padding for nav-tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 20:41:42 +03:00
Dmitriy Zaporozhets 393b54613b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-06 20:36:22 +03:00
Jeroen van Baarsen bd65f486d9 Gem update for database_cleaner 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-06 18:58:38 +02:00
Dmitriy Zaporozhets 6a14736178 Merge branch 'protect_stable_branches' into 'master' 
Protect stable branches
 2014-06-06 14:56:07 +00:00
Jacob Vosmaer 1a87fb754e Protect stable branches 2014-06-06 09:36:19 +02:00
Jeroen van Baarsen 0faf80aa9d Temp fix for rspec so the specs are run again 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-06 08:25:02 +02:00
Dmitriy Zaporozhets 8ec42ff85c Merge pull request #7090 from NARKOZ/api-files-access 
fix permissions for files API
 2014-06-06 09:08:24 +03:00