Commits · 8eeebf0de601f3a05e3fe4d273ead7aaf3257a2c · Kirill Smelkov / gitlab-ce

25 Feb, 2014 14 commits

Generate labels set from issues page · 8eeebf0d
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
8eeebf0d
Use rails preload for Dashboard issues, mr · a1b9b1d8
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
a1b9b1d8
Update rack profiler · 2171bbcd
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
2171bbcd
Dont test models methods in security specs · f7ca46b5
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
f7ca46b5
Merge branch 'shell_commands_guide' into 'master' · 63044284
Dmitriy Zaporozhets authored Feb 25, 2014
```
Shell Commands Guide
```
63044284
Fix read_group ability · 5f31caa0
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
5f31caa0
Update CAHNGELOG · b6a93420
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
b6a93420

Merge branch 'cleaner-email-headers' into 'master' · c3a3f80a

Dmitriy Zaporozhets authored Feb 25, 2014

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).

c3a3f80a

Implement project collection service · 75eed4eb

Dmitriy Zaporozhets authored Feb 25, 2014

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>

75eed4eb

Add shell commands guide · 4c746c25
Jacob Vosmaer authored Feb 25, 2014

4c746c25
Merge pull request #6375 from cirosantilli/link-with-id · 9f20580e
Dmitriy Zaporozhets authored Feb 25, 2014
```
Blob and tree gfm links to anchors work.
```
9f20580e
Add 6.6.2 to CHANGELOG · e1c00d53
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
e1c00d53
Fix group ownership for dev seeds · 136316a9
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
136316a9
Fix 500 error when try to update own profile in admin area · 44013827
Dmitriy Zaporozhets authored Feb 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
44013827

24 Feb, 2014 20 commits

Fix onion image control · 504777ec
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
504777ec
Fix commit image js · 8907a958
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
8907a958
Add public groups to change log · 97ac3def
Dmitriy Zaporozhets authored Feb 24, 2014

97ac3def

Merge branch 'feature/public_groups' into 'master' · 79dd7bee

Dmitriy Zaporozhets authored Feb 24, 2014

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.

79dd7bee

Fix btn-group align · 86e25595
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
86e25595
Merge branch 'master' of github.com:gitlabhq/gitlabhq · aff7ac37
Dmitriy Zaporozhets authored Feb 24, 2014

aff7ac37
Fix MR title buttons block · 9c410976
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
9c410976
Merge pull request #6390 from Razer6/add_missing_travis_task · 36d7b20b
Dmitriy Zaporozhets authored Feb 24, 2014
```
Add jasmine tests to postgresql db
```
36d7b20b

Fixed 500 error on branch and tag creation via UI · 31386adf

Dmitriy Zaporozhets authored Feb 24, 2014

Also fixes issue with branch/tag removing via UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

31386adf

Include 6.6.1 in CHANGELOG · 6c660698
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
6c660698
Merge branch 'file_css' into 'master' · ac98d74a
Dmitriy Zaporozhets authored Feb 24, 2014
```
Better css class names for diff elements
```
ac98d74a

Fix tests · 76ad6046

Dmitriy Zaporozhets authored Feb 24, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

76ad6046

Fix submodules 500 error · 05c5b770
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
05c5b770
Fix diff tests · 6c8a17d0
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
6c8a17d0
Use proper classes for sdiff content · 8290c9a6
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
8290c9a6
New class names in notes css · 58634dfb
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
58634dfb
Move diff css to separate file · 71d44746
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
71d44746

Revert "set layout margin-bottom 50px" · 71e7bff1

Dmitriy Zaporozhets authored Feb 24, 2014

Because .content class used in several other places and this change add
unnecessary margint ot it

This reverts commit f8807281.

71e7bff1

Proper class names for diff files · 13fbf488
Dmitriy Zaporozhets authored Feb 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
13fbf488
Merge branch 'refactor_css' into 'master' · 40a8ae5e
Dmitriy Zaporozhets authored Feb 24, 2014
```
Refactor Css
```
40a8ae5e

23 Feb, 2014 2 commits
- Add jasmine tests to postgresql db · e83fead6
  Robert Schilling authored Feb 23, 2014
  
  e83fead6
- Blob and tree gfm links to anchors work. · 90bdcac6
  Ciro Santillli authored Feb 20, 2014
```
Fixes #6046
```
  90bdcac6
21 Feb, 2014 4 commits
- Its start for 6.7.0 · e868de68
  Dmitriy Zaporozhets authored Feb 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e868de68
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 0538828f
  Dmitriy Zaporozhets authored Feb 21, 2014
  
  0538828f
- Merge branch 'feature/edit_from_mr' · 0ddf1d9d
  Dmitriy Zaporozhets authored Feb 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  0ddf1d9d
- Merge branch 'styleguide' into 'master' · 96a9c0fc
  Dmitriy Zaporozhets authored Feb 21, 2014
```
Styleguide

As discussed.
```
  96a9c0fc