home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 05:26:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,955 Commits 48 Branches 340 Tags
acb03f1fc3e7080f3eeaaaef720d33e6951ffa1b
Commit Graph
8955 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski acb03f1fc3 Add gzip asset compression to the changelog. 2014-03-26 09:46:51 +01:00
Dmitriy Zaporozhets 99a9d97c44 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-26 10:37:33 +02:00
Dmitriy Zaporozhets fb74d4a948 Merge branch 'request/monospace_gfm_input' into 'master' 
Use monospace fonts for GFM inputs

This is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).

I'm not sure exactly where the best place for the fix is, but I opted for the typography.scss file.  Basically, all ``textarea.js-gfm-input`` elements are styled with ``font-family: $monospace_font;``.

*PS: this being my first MR to gitlab, I apologize if I missed any steps in the process; let me know what's missing and I'll correct it here & in future MRs*
 2014-03-26 08:32:06 +00:00
Dmitriy Zaporozhets 17fd0e5c72 Merge pull request #6569 from criteo/api_merge_request_comments 
Add method to get the comments on a merge request
 2014-03-26 10:06:51 +02:00
Dmitriy Zaporozhets af0b59d477 Time for 6.8.0pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 09:50:18 +02:00
Dmitriy Zaporozhets eb7a986800 Merge branch 'improve_at_mentions' into 'master' 
Allow at mentions for people who are not members of the project
 2014-03-26 07:49:18 +00:00
Dmitriy Zaporozhets f0adf28ed9 Merge branch 'event-create-service' into 'master' 
EventCreateService class

The goal is to collect all event creation logic in one place called EventCreateService.
Because now its placed in observers, controllers, services etc
 2014-03-26 07:41:27 +00:00
Dmitriy Zaporozhets 05c9ab94c2 Merge branch 'refactor-author-id-of-changes' into 'master' 
Remove author_id_of_changes

To prevent confusion because we already have `current_user`
 2014-03-26 07:01:16 +00:00
Dmitriy Zaporozhets 285ed33718 Merge branch 'define-feature-request' into 'master' 
Define Feature Request in Process doc
 2014-03-25 20:07:24 +00:00
dosire 74f16902cf More strict wording of the bug criteria. 2014-03-25 20:57:58 +01:00
dosire b2e7474155 Merge branch 'master' into define-feature-request 
Conflicts:
	PROCESS.md
 2014-03-25 20:57:21 +01:00
Dmitriy Zaporozhets 7f67e066dc More compact event feed and projects list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 20:10:08 +02:00
Dmitriy Zaporozhets e421772f89 Revert "Clearfix on well-lists. Pages affected:" 
Because it adds extra spaces at each project row on dashboard

This reverts commit 2767abd90d.
 2014-03-25 19:53:30 +02:00
Marin Jankovski 9dd58c320a Add to changelog. 2014-03-25 18:53:09 +01:00
Dmitriy ZaporozhetsandMarin Jankovski 5245fac63b Version 6.7.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
 2014-03-25 18:53:09 +01:00
Marin Jankovski d26302215a Correct identation, default value if note doesn't exist. 2014-03-25 18:53:09 +01:00
Marin Jankovski 12c3962fc0 Search within project. 2014-03-25 18:53:09 +01:00
Marin Jankovski 0a4283b50a Extract sorting into a method. 2014-03-25 18:53:09 +01:00
Marin Jankovski eda2c0c607 Include commits. 2014-03-25 18:53:09 +01:00
Marin Jankovski 02850210b6 Allow referencing an existing user. 2014-03-25 18:53:09 +01:00
Marin Jankovski 01ec6c793c At mention participating users. 2014-03-25 18:53:09 +01:00
Dmitriy Zaporozhets 81527e9fba Merge pull request #6374 from zzet/patch-10 
Update merge_request_observer_spec.rb
 2014-03-25 19:41:47 +02:00
Dmitriy Zaporozhets 9afccaa8c6 Merge pull request #6554 from tsigo/remove-spork 
Remove Spork
 2014-03-25 19:40:50 +02:00
Dmitriy Zaporozhets a5d7d125e4 Merge pull request #6577 from tombruijn/group_projects_clearfix 
Clearfix on .well-list
 2014-03-25 19:40:23 +02:00
Dmitriy Zaporozhets a7aacb4dc4 Merge pull request #6586 from abner/master 
added api method to return labels of a given project
 2014-03-25 19:39:16 +02:00
Dmitriy Zaporozhets 5fc3d746d2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-25 19:33:17 +02:00
Dmitriy Zaporozhets c21c3e5707 Add bottom margin to highlighed code block in comment/wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 19:32:49 +02:00
Dmitriy Zaporozhets 535339a6ab Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 16:25:59 +02:00
Jacob Vosmaer 306d4ee728 Merge pull request #5935 from nmoura/patch-1 
Changed sudo by su -c in init script
 2014-03-25 15:06:54 +01:00
Dmitriy Zaporozhets d4bfacc365 Fix MR observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:16:12 +02:00
Dmitriy Zaporozhets 45e6abffb4 Remove activity observer specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:09:17 +02:00
Dmitriy Zaporozhets ba87b76de1 Use EventCreateService for notes, merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:08:25 +02:00
Dmitriy Zaporozhets 6cc4ac7b98 Drop activity observer. User EventCreateService instead 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:07:54 +02:00
Dmitriy Zaporozhets 12d081008d Add milestone observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:07:16 +02:00
Dmitriy Zaporozhets d89130b097 Collect all event creation logic in one place called EventCreateService 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:48:02 +02:00
Dmitriy Zaporozhets cce80d04fe Remove author_id_of_changes from spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:02:55 +02:00
Dmitriy Zaporozhets f08464c055 Remove author_id_of_changes from app 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:01:52 +02:00
Dmitriy Zaporozhets 80daf9a777 Use current_user for Notification#merge_mr 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 13:47:48 +02:00
Dmitriy Zaporozhets 8bbac4576b Simplify run tests command 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 12:10:50 +02:00
Dmitriy Zaporozhets e320ee3fb7 Merge branch 'humanize-over-titleize' into 'master' 
Use humanize instead of titleize for MR title suggestion
 2014-03-25 10:06:11 +00:00
Dmitriy Zaporozhets 7847e10863 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 12:05:37 +02:00
Dmitriy Zaporozhets 0aed79b5b5 Merge branch 'improve-archived-projects' into 'master' 
Proper message for archived projects at MR#show page

Fixes #940
 2014-03-25 09:41:35 +00:00
Dmitriy Zaporozhets 12778fbe19 Merge pull request #6612 from Datacom/feature/print_styles_pr 
Print Styles
 2014-03-25 11:07:10 +02:00
Dmitriy Zaporozhets 2677f79353 Merge branch 'sidekiq_load_check' into 'master' 
Sidekiq Load Check
 2014-03-25 08:17:21 +00:00
Dmitriy Zaporozhets 069c8a95a0 Merge branch 'external-issue-tracker-instructions' into 'master' 
External Issue Tracker Instructions
 2014-03-25 08:17:05 +00:00
Dmitriy Zaporozhets d7f1b366bb Merge branch 'no-verify-for-webhooks' into 'master' 
Inform people about the verify-none for webhooks.

Fixes #980
 2014-03-25 08:15:43 +00:00
Dmitriy Zaporozhets 72b13cc1be Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-25 09:04:22 +02:00
Dmitriy Zaporozhets bbca0351f7 Merge pull request #6606 from kemenaran/fix-merge-notifications 
Fix the merge notification email not being sent
 2014-03-25 09:03:14 +02:00
George Dewar 842ad4a425 Initial implementation 2014-03-25 15:58:16 +13:00
Dmitriy Zaporozhets 3d8ecbc94f Merge branch 'no-emails-for-mentions' into 'master' 
Don't send an email for "mentioned in" notes

Currently, an email is sent every time a mentionable is referenced by an issue, a commit or a merge request: if I comment "This MR is related to #5", the watchers get one email for the comment, and another one stating "Issue #5 was mentioned by issue #13".

This is annoying — but the biggest issue is when pushing an existing branch. Every issue referenced by commit messages in this branch will get a new mention (which is fine), and dozens of emails will be sent for all these new mentions (which is not).

This commit fixes the spam by avoiding to send an email when a new mention is added to an existing mentionable. In most cases the email notification sent by the mentioner is enough.
 2014-03-24 18:52:41 +00:00