Commit Graph
6502 Commits
Author SHA1 Message Date
Timm Drevensek c0744e5ba0 simplify link url 2014-02-28 17:22:07 +01:00
Dmitriy Zaporozhets 049d0cc396 Add bottom padding to body
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 16:56:41 +02:00
Dmitriy Zaporozhets 8064b3b767 Fix btn margin for commit show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 16:18:47 +02:00
Dmitriy Zaporozhets 9114cfbb0a Merge branch 'issue-improve-ui' into 'master'
Issue Improve Ui
2014-02-28 11:07:37 +00:00
Dmitriy Zaporozhets f4b2cee695 Revert font-smoothing to default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 10:18:49 +02:00
Dmitriy Zaporozhets 3dcfae7524 Add default value for Project#archived
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 09:57:19 +02:00
Dmitriy Zaporozhets 5ebdbfab84 Merge branch 'pg_fixes' into 'master'
Postgres fixes

For applications migrated from MySQL to PostreSQL it fixes some issues
Fixes #1060
2014-02-28 07:02:44 +00:00
Dmitriy Zaporozhets db80c149cf Merge branch 'gitlab_git_5_6' into 'master'
Use new gitlab_git gem. It makes CONTRIBUTING.md work
2014-02-27 20:46:50 +00:00
Dmitriy Zaporozhets 6dcfc1040d Issue box restyle
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 21:04:44 +02:00
Dmitriy Zaporozhets f248e4f57a Merge pull request #6359 from jasonblanchard/comment-attachment-filename
Fixed attachment identifier displaying underneath note text
2014-02-27 16:27:11 +02:00
Dmitriy Zaporozhets ccd617e58e Default values for web hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 15:56:35 +02:00
Dmitriy Zaporozhets 0de7a7cfcd Add default value for Project#imported boolean
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 15:55:22 +02:00
Dmitriy Zaporozhets cac868ee94 Use new gitlab_git gem. It makes CONTRIBUTING.md work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 15:52:14 +02:00
tsl0922 5c3972ae1e remove dead code: broken_diffs 2014-02-27 14:58:27 +08:00
Timm Drevensek e935635620 fixed regex to match url pointing to a user repo 2014-02-26 23:33:04 +01:00
Dmitriy Zaporozhets 4713fc34cf Merge pull request #6416 from robbytaylor/patch-1
Fixed typo in comments of apllication.scss
2014-02-26 22:44:50 +02:00
Dmitriy Zaporozhets a1e5d4e8b5 Merge pull request #6382 from jvanbaarsen/contribution-guide-link
Contribution guide link
2014-02-26 18:22:22 +02:00
Dmitriy Zaporozhets d36669d8ea Merge pull request #6420 from Seklfreak/add-piwik-support
Added Piwik Integration
2014-02-26 18:19:25 +02:00
Dmitriy Zaporozhets 63d0c0b93b Merge branch 'gitlab_popen_array' into 'master'
Change Gitlab::Popen to only accept arrays as commands
2014-02-26 15:38:56 +00:00
Dmitriy Zaporozhets a9280de11f Better redirect for edit blod from MergeRequest
If you cancel edit you will be redirected back to merge request
If you submit changes you will be redirected back to merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 14:06:31 +02:00
Dmitriy Zaporozhets 5d6e4bd2d8 Fix gitlab ci widget for forks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 13:18:27 +02:00
Dmitriy Zaporozhets 1ff1b6d816 Merge pull request #5719 from jacob-carlborg/mr_target
By default, target original repository if it's a fork when creating new MR.
2014-02-26 12:33:48 +02:00
Dmitriy Zaporozhets a355ea6f17 Default values gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 10:41:44 +02:00
Rob Taylor 0afd656b92 Fixed typo in comments of apllication.scss 2014-02-26 08:31:04 +00:00
Dmitriy Zaporozhets 084bb6b1fc Small css fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 10:13:11 +02:00
Dmitriy Zaporozhets fd76f49786 Fix commit description expand
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 10:06:58 +02:00
Dmitriy Zaporozhets f1e1e5bf0d Merge pull request #6412 from skv-headless/commit_description
commit description in commit list
2014-02-26 09:54:26 +02:00
Dmitriy Zaporozhets 5bdcdcd81f Add border to white code blocks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 09:51:23 +02:00
Timm Drevensek fe8c902126 Add support for relative submodules 2014-02-25 22:42:45 +01:00
Dmitriy Zaporozhets 345b3d4b72 Update tests and fix Finders readme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 19:21:53 +02:00
Dmitriy Zaporozhets 645e8d4705 Move services for collecting items to Finders
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 19:15:08 +02:00
Dmitriy Zaporozhets 0f47367492 Fix mr preload assoc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 18:15:11 +02:00
Dmitriy Zaporozhets 8eeebf0de6 Generate labels set from issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:47:29 +02:00
Dmitriy Zaporozhets a1b9b1d83f Use rails preload for Dashboard issues, mr
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:42:22 +02:00
Dmitriy Zaporozhets 2171bbcd6e Update rack profiler
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:41:56 +02:00
skv-headless 2c28dbd254 commit description in commit list 2014-02-25 18:23:23 +04: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 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 36c2c354fc Adapt use of Gitlab::Popen to new style 2014-02-25 12:00:33 +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 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
Jacob CarlborgandJacob Carlborg 9439cb5526 By default, target original repository if fork when creating new MR. 2014-02-24 22:06:25 +01: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 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
Pierre de La Morinerie 5818cf063b 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", 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 created. In most cases the email notification for the
mentioner is enough.
2014-02-24 15:34:56 +01: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 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