home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,028 Commits 48 Branches 340 Tags
dfc92cd25d7025378a4411525dc5a1b8ff5b1663
Commit Graph
4760 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2ab2d60b9e Merge pull request #6660 from robertboloc/patch-1 
Grammar correction: "View in Gitlab"
 2014-03-31 15:55:07 +03:00
Robert Boloc dd32c9f0ed Updated notification message 2014-03-31 12:24:55 +02:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Robert Boloc 3055331965 Grammar correction: "View in Gitlab" 
Changed to "View on Gitlab"
 2014-03-31 12:05:41 +02:00
Dmitriy Zaporozhets 0488e34ba7 Merge branch 'refactor_project_watchers_notifications' into 'master' 
Refactor project watchers notifications
 2014-03-29 12:10:53 +00:00
Marin Jankovski c34186f882 Refactor project watchers collecting. 2014-03-28 17:51:13 +01:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Tom de Bruijn b7225bead8 Clearfix on well-lists. Pages affected: 
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
 2014-03-28 11:14:23 +01:00
Dmitriy Zaporozhets 0e44039e52 Merge pull request #6395 from dpursehouse/grammar-fixes 
Fix another instance of "created at"
 2014-03-27 19:53:22 +02:00
Dmitriy Zaporozhets c66218ec94 Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission 
Always show merge status
 2014-03-27 19:48:05 +02:00
Jeroen van Baarsen 592dce18b5 Always show merge status 
Always show the merge status of a merge request, even if the user has no
permission to do the actual merging.

Fixes
http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status
 2014-03-27 15:32:28 +01:00
Kyle Fazzari 762c7b4f2b Fixed 500 error when creating issue for project with no commits. 
The form was updated to check that the repository wasn't empty before trying
to load the contribution guide.

This fixes #153.
 2014-03-27 08:20:43 -04:00
Marin Jankovski 0f05519777 Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2 
Refactor Parallel Diff feature and add scrollbars
 2014-03-27 08:20:25 +01:00
George Dewar 83f811fff5 Refactor Parallel Diff feature and add scrollbars 
Also now removed lines relating to unused comments feature
 2014-03-27 09:15:25 +13:00
Dmitriy Zaporozhets 7ddbc92abc Merge branch 'case_insensitive_user_search' into 'master' 
Case insensitive user search

As per implementation by Christopher Arnold.
 2014-03-26 19:08:35 +00:00
Marin Jankovski 043c9f8640 Change Diff to Changes in views. 2014-03-26 14:00:12 +01:00
Marin Jankovski 1aabfcb92d Change the user search query to be case insensitive. 2014-03-26 12:45:39 +01:00
Andrea Usuelli d21ad74146 Changed the notification sender username to GitLab in Slack Notifier 2014-03-26 10:58:51 +01:00
Dmitriy Zaporozhets c818712dfa Reduce comments font size for events feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 11:13:06 +02:00
Dmitriy Zaporozhets 92ca779ebc Improve comment header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 10:55:04 +02:00
Dmitriy Zaporozhets 0a05c8dd8d Improve md typography 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 10:45:22 +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 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 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 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 01ec6c793c At mention participating users. 2014-03-25 18:53:09 +01: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 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 d4bfacc365 Fix MR observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:16:12 +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 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 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 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 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
Dmitriy Zaporozhets 55be026e59 Merge branch 'application-js-coffee' into 'master' 
Applications js to coffee
 2014-03-24 17:37:38 +00:00
Dmitriy Zaporozhets cec02067ec Merge branch 'improve-mr-form' into 'master' 
Remove assignee/milestone selects from MR form

Fixes #1079 and http://feedback.gitlab.com/forums/176466-general/suggestions/5663897-merge-request-assign-to-should-popule-with-membe
 2014-03-24 15:41:53 +00:00