Commit Graph
4837 Commits
Author SHA1 Message Date
Ryan Mendivil 1c46a0d471 Fix grammar in zero_authorized_projects view 2014-03-08 10:33:28 -09:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
2014-03-05 20:44:01 +01:00
Tyler Sommer e9942e5a79 Fixed readme page title 2014-03-05 11:23:21 -08:00
Javier Castro b61f80babb Merge remote-tracking branch 'upstream/master' into fix-4305 2014-03-04 15:09:33 -03:00
Dmitriy Zaporozhets d0e73eeca1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-03 22:01:46 +02:00
Pierre de La Morinerie ad278c4e74 Make the merge request notification emails more readable
Emphasize the meaningful informations, and remove the less needed ones:

* Use "!" to identify a merge request
* Write the name of the commented file for diff notes
* Don't show the assignee in the "merged merge request" email
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 306744bbb0 Simplify the default layout of notification emails
* Less margin: the content appears as the text of the message.

* Streamlined footer: everything on one line, with a small separator.

* Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display
the content of the message. Switching to a simpler layout fixes the
issue.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7959455f4d Remove the header banner in notification emails
Rationale:

* The link to the project is already displayed in the message footer.

* Streamlining: the content of the message is better emphasized.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie ec196fbbf2 Remove the quote-style around message in notification emails
Rationale:

* In this notification email, the message is the most important content.
It should not be dimmed or smaller than the rest of the text.

* Now that all UI elements are removed, the message *is* the email. It
should be written as a standard email message, without styling.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie eeb011e34a Remove the author name from issue notes emails
Rationale: the author name is now displayed in the email "From" field;
this information is no longer needed.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 8e421d2bcb Add the description to the "new issue" and "new merge request" emails
Previously the content of the issue or merge request was missing from
the email.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie b59d105c0e Linkify the reference to the project in the notification emails footer
Rationale:

* Consistency: the link is always at the same place.

* Streamlining: it allows to remove the header banner, now that the
project url can be accessed from another place.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie edd6028bdb Remove custom link to target in notification emails
Every email has a different way of showing a link to the discussion on
the website. We don't need this anymore, as we now have a standard
"View in GitLab" link in the footer of every email.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7ba0b502d3 Add a "View in GitLab" link in notification emails
When an email notification concerns a specific object (issue, note,
merge request, etc.), add a link to the footer of the email that opens
the item's page in a web browser.

Rationale:

* The link is predictable: always the same text, always at the same
location, like any reliable tool.

* It allows to remove the inline-title in many emails, and leave only
the actual content of the message.
2014-03-03 16:58:44 +01:00
Dmitriy Zaporozhets e6e0ad4e5e Merge branch 'feature/reopen_mr' into 'master'
Feature: reopen closed merge request
2014-03-03 13:18:48 +00:00
dosire 2135da1466 Also make the blog https. 2014-03-03 09:28:28 +01:00
dosire c3d5503984 Link to consolidated website with https links. Fixes #6017 2014-03-02 18:03:37 +01:00
Dmitriy Zaporozhets a9dcfd851f Merge pull request #6308 from jvanbaarsen/help-to-markdown
Convert all help files to markdown files in doc directory
2014-03-01 15:02:07 +02:00
Dmitriy Zaporozhets 36b065e634 Feature: reopen closed merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 22:43:16 +02:00
Dmitriy Zaporozhets 110585c503 Hide mr close button for comment form if merge request was closed or inline comment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 22:23:08 +02:00
Jeroen van Baarsen 564c37d9b6 Moved all the help files to markdown files:
Files moved:
* Workflow
* help/ssh
* help/webhooks
* help/system_hooks
* help/public_access
* help/permissions
2014-02-28 19:30:13 +01: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 6dcfc1040d Issue box restyle
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 21:04:44 +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 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 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 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 8eeebf0de6 Generate labels set from issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:47:29 +02:00
skv-headless 2c28dbd254 commit description in commit list 2014-02-25 18:23:23 +04: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 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 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
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
David Pursehouse 62b227b2f3 Fix another instance of "created at"
Replace it with "created on".

Change-Id: Ibd26bf82d2e64f142a4f3be6da7701e5b035602f
2014-02-24 16:37:36 +09: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
Sebastian Winkler 64e4b400d0 Added Piwik support 2014-02-23 15:13:38 +01:00
Jacob CarlborgandJacob Carlborg 2d554f42f0 Add button for toggling inline comments in diff view.
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
2014-02-22 21:21:12 +01:00
Jeroen van Baarsen bb35c2d36f Added the contribution guide notice
This is shown at the creation of new issues and new merge requests, when
the repository has a contribution guide file.
2014-02-22 16:37:10 +01:00
Jason Hollingsworth 2f69213e3f Allow access to groups with public projects.
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
2014-02-20 09:26:38 -06:00
Dmitriy Zaporozhets e39f0de8ee Add edit button to MergeRequest diff
It will redirect you to file edit page.
After submit changes you will be redirected back to merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 16:39:13 +02:00
Dmitriy Zaporozhets 32ecb02784 Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:51:22 +02:00
Dmitriy Zaporozhets f92b1f3d01 Use more specific class names: grouped -> btn-grouped
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:05:33 +02:00
Dmitriy Zaporozhets 2b8d289130 Fix readme h4 style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 13:10:31 +02:00