home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,476 Commits 48 Branches 340 Tags
f7ca46b5a3bf4e74f432de8a4adfd2ebbb2e3bc5
Commit Graph
8476 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f7ca46b5a3 Dont test models methods in security specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 17:14:03 +02:00
Dmitriy Zaporozhets 6304428467 Merge branch 'shell_commands_guide' into 'master' 
Shell Commands Guide
 2014-02-25 14:56:23 +00:00
Dmitriy Zaporozhets 5f31caa0ed Fix read_group ability 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 15:45:19 +02:00
Dmitriy Zaporozhets b6a934207c Update CAHNGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 15:39:55 +02:00
Dmitriy Zaporozhets c3a3f80af9 Merge branch 'cleaner-email-headers' into 'master' 
Cleaner headers in Notification Emails

Make the informations available in the notification email headers (sender, recipient, subject, etc.) more readable and meaningful.

* Remove the email subject prefix
* Don't write the project namespace in email subjects
* Write the issue/merge request title in the notification email subject
* Make the email appear as sent from the action author (the actual email address is still `gitlab@gitlab.com`)

For instance, this is the notification email for a new issue comment before:

> From: gitlab@gitlab.com
> To: myemailaddress@gmail.com
> Subject: GitLab | GitLab HQ / GitLab-Shell | New note for issue #1234

And after :

> From: Nick Brown &lt;gitlab@gitlab.com&gt;
> To: myemailaddress@gmail.com
> Subject: GitLab-Shell |  Add local update hook  (#1234)

The recipient of the notification can easily get the gist of the message without even opening it — just by looking at how it appears in her inbox. None of the actual email addresses (From, To, Reply-to) changes, just the display name.

Having a consistent subject for all notification emails sent about some resource also allow good email clients to group the discussion by thread (although grouping in Mail.app still needs some work).
 2014-02-25 13:34:06 +00:00
Dmitriy Zaporozhets 75eed4eb83 Implement project collection service 
Main purpose is move big amount of methods from user, group, project
models and place filtering logic in one place.
It also fixes 500 error on group page for PostgreSQL

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 14:36:36 +02:00
Jacob Vosmaer 4c746c2522 Add shell commands guide 2014-02-25 11:53:01 +01:00
Dmitriy Zaporozhets 9f20580ed7 Merge pull request #6375 from cirosantilli/link-with-id 
Blob and tree gfm links to anchors work.
 2014-02-25 10:58:24 +02:00
Dmitriy Zaporozhets e1c00d5300 Add 6.6.2 to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 10:54:07 +02:00
Dmitriy Zaporozhets 136316a92d Fix group ownership for dev seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 10:44:29 +02:00
Dmitriy Zaporozhets 4401382798 Fix 500 error when try to update own profile in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 10:15:43 +02:00
Dmitriy Zaporozhets 504777ec20 Fix onion image control 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 21:57:59 +02:00
Dmitriy Zaporozhets 8907a95869 Fix commit image js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 21:54:12 +02:00
Dmitriy Zaporozhets 97ac3def1f Add public groups to change log 2014-02-24 19:41:10 +00:00
Dmitriy Zaporozhets 79dd7beebd Merge branch 'feature/public_groups' into 'master' 
Public Groups

This is the initial work (meaning no tests) for making groups public if they have a public project (or internal for logged in users). This allows issues and merge requests to be viewed, but _not_ group membership. As part of this I have also added back the link in the public project title section (it was removed as it didn't make sense before).

This addesses the following suggestions/issues:

http://feedback.gitlab.com/forums/176466-general/suggestions/5314461-groups-containing-one-or-more-public-projects-shou
Issue #32
https://github.com/gitlabhq/gitlabhq/issues/5203
as well as a few closed issues.

This also changes the public user page to only show groups that are accessible to the user in some manner.
 2014-02-24 19:37:13 +00:00
Dmitriy Zaporozhets 86e25595c8 Fix btn-group align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 17:44:25 +02:00
Dmitriy Zaporozhets aff7ac37ad Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-24 15:19:52 +02:00
Dmitriy Zaporozhets 9c41097665 Fix MR title buttons block 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 15:17:36 +02:00
Dmitriy Zaporozhets 36d7b20b8d Merge pull request #6390 from Razer6/add_missing_travis_task 
Add jasmine tests to postgresql db
 2014-02-24 15:01:35 +02:00
Dmitriy Zaporozhets 31386adf53 Fixed 500 error on branch and tag creation via UI 
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 14:55:27 +02:00
Dmitriy Zaporozhets 6c660698eb Include 6.6.1 in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 14:21:34 +02:00
Dmitriy Zaporozhets ac98d74adb Merge branch 'file_css' into 'master' 
Better css class names for diff elements
 2014-02-24 11:50:21 +00:00
Dmitriy Zaporozhets 76ad6046f9 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 13:50:06 +02:00
Dmitriy Zaporozhets 05c5b77070 Fix submodules 500 error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 13:22:00 +02:00
Dmitriy Zaporozhets 6c8a17d06d Fix diff tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 12:17:39 +02:00
Dmitriy Zaporozhets 8290c9a67f Use proper classes for sdiff content 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:51:50 +02:00
Dmitriy Zaporozhets 58634dfb6a New class names in notes css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:43:45 +02:00
Dmitriy Zaporozhets 71d4474684 Move diff css to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:36:22 +02:00
Dmitriy Zaporozhets 71e7bff1ea Revert "set layout margin-bottom 50px" 
Because .content class used in several other places and this change add
unnecessary margint ot it

This reverts commit f8807281ee.
 2014-02-24 09:32:24 +02:00
Dmitriy Zaporozhets 13fbf48892 Proper class names for diff files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:31:36 +02:00
Dmitriy Zaporozhets 40a8ae5e5f Merge branch 'refactor_css' into 'master' 
Refactor Css
 2014-02-24 07:24:14 +00:00
Robert Schilling e83fead6d1 Add jasmine tests to postgresql db 2014-02-23 14:30:06 +01:00
Ciro Santillli 90bdcac6b1 Blob and tree gfm links to anchors work. 
Fixes #6046
 2014-02-23 09:47:52 +01:00
Dmitriy Zaporozhets e868de687d Its start for 6.7.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 19:45:28 +02:00
Dmitriy Zaporozhets 0538828fdd Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-21 19:43:13 +02:00
Dmitriy Zaporozhets 0ddf1d9dfd Merge branch 'feature/edit_from_mr' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-02-21 19:42:55 +02:00
Dmitriy Zaporozhets 96a9c0fc38 Merge branch 'styleguide' into 'master' 
Styleguide

As discussed.
 2014-02-21 17:41:29 +00:00
Dmitriy Zaporozhets d68525ff97 Merge pull request #6369 from skv-headless/postrgesql_travis_testing 
postgresql testing on travis
 2014-02-21 19:39:19 +02:00
Dmitriy Zaporozhets 2e198cc3f1 Merge pull request #6366 from popomore/patch-1 
set layout margin-bottom 50px
 2014-02-21 19:39:01 +02:00
Dmitriy Zaporozhets af0ed69045 Merge pull request #6372 from gemnasium/add_gemnasium_service 
Add support for Gemnasium as a project service
 2014-02-21 19:37:34 +02:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab 
Conflicts:

	db/schema.rb
 2014-02-21 16:25:22 +01:00
Dmitriy Zaporozhets 490f99d45e New stable branches and update guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0 		2014-02-21 17:07:43 +02:00
Dmitriy Zaporozhets 1a3527f6e7 Version to 6.6.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 17:02:38 +02:00
dosire 3af7254174 Markdown doesn't render correctly yet. 2014-02-21 15:38:05 +01:00
dosire 403298317f Merge branch 'master' into styleguide 
Conflicts:
	CONTRIBUTING.md
 2014-02-21 15:36:53 +01:00
dosire 77dc5de923 Solve conflict and add more explanations on how to contribute. 
Conflicts:
	CONTRIBUTING.md
 2014-02-21 15:34:38 +01:00
Dmitriy Zaporozhets bbd92f554d Limit huge images in diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 16:32:42 +02:00
skv-headless 544ce2d06a postgresql testing on travis 2014-02-21 14:32:06 +04:00
dosire 3c053bdc20 Add style guidelines in separte paragraph. 2014-02-21 11:05:37 +01:00
Haoliang Gao f8807281ee set layout margin-bottom 50px 2014-02-21 14:46:27 +08:00