summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'highlight_html_escape' into 'master'Dmitriy Zaporozhets2014-02-271-1/+1
|\ | | | | | | | | | | Enable html_escape for code blocks highlighted in markdown Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
| * html_escape is private for rails 4.0.2 :(Dmitriy Zaporozhets2014-02-271-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Enable html_escape for code blocks highlighted in markdownDmitriy Zaporozhets2014-02-271-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'backup_restore_hooks_bug' into 'master'Dmitriy Zaporozhets2014-02-261-2/+1
|\ \ | |/ |/| | | Fix backup/restore git hooks bug
| * Use gitlab_shell.path to invoke rewrite-hooks.shJacob Vosmaer2014-02-261-2/+1
| | | | | | | | | | | | | | The backup restore code for repositories was assuming that gitlab-shell is installed in /home/git/gitlab-shell. This commit changes that to use the configuration setting from gitlab.yml that specifies the path where gitlab-shell is installed.
* | More entries to CHANGELOGDmitriy Zaporozhets2014-02-261-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #6382 from jvanbaarsen/contribution-guide-linkDmitriy Zaporozhets2014-02-266-4/+24
|\ \ | | | | | | Contribution guide link
| * | Added the contribution guide noticeJeroen van Baarsen2014-02-224-1/+21
| | | | | | | | | | | | | | | This is shown at the creation of new issues and new merge requests, when the repository has a contribution guide file.
| * | Bumped the gitlab_git gem versionJeroen van Baarsen2014-02-222-3/+3
| | |
* | | Merge pull request #6420 from Seklfreak/add-piwik-supportDmitriy Zaporozhets2014-02-263-0/+17
|\ \ \ | | | | | | | | Added Piwik Integration
| * | | Added Piwik supportSebastian Winkler2014-02-233-0/+17
| |/ /
* | | Merge branch 'gitlab_popen_array' into 'master'Dmitriy Zaporozhets2014-02-264-7/+31
|\ \ \ | | | | | | | | | | | | Change Gitlab::Popen to only accept arrays as commands
| * | | Adapt use of Gitlab::Popen to new styleJacob Vosmaer2014-02-252-2/+2
| | | |
| * | | Make it possible to call Gitlab::Popen.popenJacob Vosmaer2014-02-251-0/+2
| | | |
| * | | Make the Gitlab::Popen path argument optionalJacob Vosmaer2014-02-252-1/+11
| | | |
| * | | Change Gitlab::Popen to use arrays for commandsJacob Vosmaer2014-02-252-4/+16
| | | |
* | | | Merge branch 'improve/edit_cancel' into 'master'Dmitriy Zaporozhets2014-02-264-9/+26
|\ \ \ \ | |_|_|/ |/| | | | | | | Better redirect for edit blobs from MergeRequest
| * | | Better redirect for edit blod from MergeRequestDmitriy Zaporozhets2014-02-264-9/+26
|/ / / | | | | | | | | | | | | | | | | | | 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>
* | | Fix gitlab ci widget for forksDmitriy Zaporozhets2014-02-261-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add default settings to test env. Removed wrong comment for rack_profilerDmitriy Zaporozhets2014-02-262-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #5719 from jacob-carlborg/mr_targetDmitriy Zaporozhets2014-02-265-5/+22
|\ \ \ | | | | | | | | By default, target original repository if it's a fork when creating new MR.
| * | | By default, target original repository if fork when creating new MR.Jacob Carlborg2014-02-245-5/+22
| | | |
* | | | Enable SQL queries in mini-profilerDmitriy Zaporozhets2014-02-262-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Default values gemDmitriy Zaporozhets2014-02-263-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Small css fixesDmitriy Zaporozhets2014-02-262-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix commit description expandDmitriy Zaporozhets2014-02-262-20/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #6412 from skv-headless/commit_descriptionDmitriy Zaporozhets2014-02-263-8/+49
|\ \ \ \ | | | | | | | | | | commit description in commit list
| * | | | commit description in commit listskv-headless2014-02-253-8/+49
| | | | |
* | | | | Add border to white code blocksDmitriy Zaporozhets2014-02-262-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'refacoring/selectors' into 'master'Dmitriy Zaporozhets2014-02-2518-140/+210
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refacoring: Finders Services -> change data Finders -> select data
| * | | | | Update tests and fix Finders readmeDmitriy Zaporozhets2014-02-254-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Move services for collecting items to FindersDmitriy Zaporozhets2014-02-2515-105/+163
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix mr preload assocDmitriy Zaporozhets2014-02-252-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix email testDmitriy Zaporozhets2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Generate labels set from issues pageDmitriy Zaporozhets2014-02-252-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Use rails preload for Dashboard issues, mrDmitriy Zaporozhets2014-02-252-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Update rack profilerDmitriy Zaporozhets2014-02-252-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Dont test models methods in security specsDmitriy Zaporozhets2014-02-254-22/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'shell_commands_guide' into 'master'Dmitriy Zaporozhets2014-02-252-0/+112
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Shell Commands Guide
| * | | | Add shell commands guideJacob Vosmaer2014-02-252-0/+112
| | |/ / | |/| |
* | | | Fix read_group abilityDmitriy Zaporozhets2014-02-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Update CAHNGELOGDmitriy Zaporozhets2014-02-251-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'cleaner-email-headers' into 'master'Dmitriy Zaporozhets2014-02-259-52/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | Send emails from the authorPierre de La Morinerie2014-02-199-39/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Write the issue/merge request title in the notification email subjectPierre de La Morinerie2014-02-193-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Don't write the project namespace in email subjectsPierre de La Morinerie2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Remove the email subject prefixPierre de La Morinerie2014-02-193-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Fix misleading commentPierre de La Morinerie2014-02-191-1/+1
| | | | |
* | | | | Implement project collection serviceDmitriy Zaporozhets2014-02-255-5/+132
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #6375 from cirosantilli/link-with-idDmitriy Zaporozhets2014-02-257-15/+118
|\ \ \ \ | | | | | | | | | | Blob and tree gfm links to anchors work.
View Lorry Controller Status