Commit Graph
6502 Commits
Author SHA1 Message Date
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 05c5b77070 Fix submodules 500 error
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 13:22:00 +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
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 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
Sebastian Winkler 64e4b400d0 Added Piwik support 2014-02-23 15:13:38 +01:00
Ciro Santillli 90bdcac6b1 Blob and tree gfm links to anchors work.
Fixes #6046
2014-02-23 09:47:52 +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
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 2e198cc3f1 Merge pull request #6366 from popomore/patch-1
set layout margin-bottom 50px
2014-02-21 19:39:01 +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 bbd92f554d Limit huge images in diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-21 16:32:42 +02:00
Haoliang Gao f8807281ee set layout margin-bottom 50px 2014-02-21 14:46:27 +08: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
Marin Jankovski e8466a21ca Merge branch 'case_sensitivity' into 'master'
Case Sensitivity for MYSQL

#1014
2014-02-20 12:18:22 +00:00
Dmitriy Zaporozhets 0f080a9410 Make sure note.system is false if created by user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 14:07:42 +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
Marin Jankovski c1dddf8c7d Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. 2014-02-20 09:45:58 +01:00
Jason Blanchard 29d400ba0d Fixed attachment identifier displaying underneath note text 2014-02-19 20:35:21 -05:00
Pierre de La Morinerie 96dded3ec8 Send emails from the author
This changes the email "From" field from "gitlab@example.com" to either:

* "John Doe <gitlab@example.com>" if the author of the action is known,
* "GitLab <gitlab@example.com>" otherwise.

Rationale: this allow mails to appear as if they were sent by the
author. It appears in the mailbox more like a real discussion between
the sender and the receiver ("John sent: we should refactor this") and
less like a robot notifying about something.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 57cb1ca791 Write the issue/merge request title in the notification email subject
This changes the email subjects for issues and merge request
notifications from:

    Team / Project | Note for issue #1234

to:

    Team / Project | Saving issue doesn't work sometimes (#1234)

Rationale:

* Scan the subject of the email notification more easily when catching
up with a lot of notifications. Instead of having to open the email to
get the title of the issue or merge request, one can simply read the
subject of the email.

* Group messages by subject: email clients will group emails in threads
if they have the same subject.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie d8a24003cb Don't write the project namespace in email subjects
For instance, the email "Subject" field changes from:

    Mattt / Ground Control | Saving issue doesn't work sometimes (#1234)

to:

    Ground Control | Saving issue doesn't work sometimes (#1234)

Rationale:

* Most people are receiving email notifications about a single fork:
the project activity, issues and merge requests are happening either
in a root repository or in a fork, but less often in several forks.

* It removes noise from the email subject. The namespace of the project
can still be read in the email body.

* For Entreprise users that have a single namespace "MyEntreprise",
having this repeated in every email subject is very noisy.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 44ab156ef4 Remove the email subject prefix
This changes email subjects from:

    GitLab | Team / Project | Note for issue #1234

to:

    Team / Project | Note for issue #1234

Rationale:

* Emails should be as meaningful as possible, and emphasize content over
chrome. The "GitLab" name is more chrome than content.

* Users can tell an email coming from GitLab by the sender or the header
in the email content.

* An organization that works mainly with GitLab knows that
every SVC email comes from GitLab. For these organizations, having
"GitLab" in front of every email is just noise hiding the meaningful
information.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 49cb1c7277 Fix misleading comment 2014-02-19 18:25:18 +01: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
Dmitriy Zaporozhets ee75029867 Move assignee/milestone below description of Issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 09:38:01 +02:00
Dmitriy Zaporozhets 83d35399d1 Move MR alert info out of issue-box
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 22:29:12 +02:00
Dmitriy Zaporozhets 88b8b15dbd Improve UI for Issue/MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 22:05:44 +02:00
Dmitriy Zaporozhets 7e42084fb8 Move author/date info for Issue#show, MR#show pages to issue-box
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 21:18:46 +02:00
Dmitriy Zaporozhets a718a9af3e Restyle labels filter to match common style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:48:02 +02:00
Dmitriy Zaporozhets 638f8541dc Hide labels filter for MRs and remove unnecessary padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:36:03 +02:00
Dmitriy Zaporozhets 25741c97a2 Merge pull request #6350 from tudorpavel/filter-by-multiple-labels
Add feature to filter issues by multiple labels
2014-02-18 20:32:04 +02:00
Dmitriy Zaporozhets 1c61ac1c64 Refactor MR code reload
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:17:26 +02:00
Dmitriy Zaporozhets e1c93a6bca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-18 20:10:00 +02:00
Dmitriy Zaporozhets f0750b9166 Add close button to MR comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:09:31 +02:00
Dmitriy Zaporozhets 4eba8036ac Merge branch 'request/branch_compare' into 'master'
Fix for compare button within branches dialog

For the button Compare within the Branches screen ( https://gitlab.com/gitlab-org/gitlab-ce/branches ) beside a branch "foo"

Old behavior:
Will redirect to the compare page that is defaulted to comparison for branch "foo" <--> "foo"

New behavior:
Will redirect and trigger compare page of branch "default" <--> "foo"
Remove of button beside default branch
2014-02-18 15:51:51 +00:00
Dmitriy Zaporozhets 0bf4e568ea Use same avatar size for all event rows
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:49:50 +02:00
Dmitriy Zaporozhets ec8628fa95 Merge branch 'feature/mr_context' into 'master'
Allow change assignee/milestone from MergeRequest show page
2014-02-18 14:29:44 +00:00
Dmitriy Zaporozhets 702128892b Allow change assignee/milestone from MergeRequest show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:24:27 +02:00
Dmitriy Zaporozhets b05a67f4e3 Split merge request coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:22:57 +02:00
Dmitriy Zaporozhets 8686d09d3e Merge branch 'feature/api_fle_encoded' into 'master'
Complete api files CRUD

Adds ability to read file from repository with content encoded with Base64.
2014-02-18 14:15:40 +00:00
Tudor Pavel 4f6b570fbe Filter issues by multiple labels with Spinach feature spec 2014-02-18 15:38:33 +02:00
Dmitriy Zaporozhets 8a55636f89 Dont replace all issue context when change assignee/milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 13:15:43 +02:00