Commit Graph
8513 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 981deddfce Merge branch 'highlight_html_escape' into 'master'
Enable html_escape for code blocks highlighted in markdown

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
2014-02-27 11:13:46 +00:00
Dmitriy Zaporozhets c94dc3de78 html_escape is private for rails 4.0.2 :(
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 11:12:12 +02:00
Dmitriy Zaporozhets 4d896a2b86 Enable html_escape for code blocks highlighted in markdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 09:38:11 +02:00
Dmitriy Zaporozhets b155a44ef4 Merge branch 'backup_restore_hooks_bug' into 'master'
Fix backup/restore git hooks bug
2014-02-26 20:54:23 +00:00
Jacob Vosmaer 91c70c5b1c Use gitlab_shell.path to invoke rewrite-hooks.sh
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.
2014-02-26 17:32:52 +01:00
Dmitriy Zaporozhets fd3ab6955f More entries to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 18:24:05 +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 6c1af64566 Merge branch 'improve/edit_cancel' into 'master'
Better redirect for edit blobs from MergeRequest
2014-02-26 15:18:07 +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 6ef3505b19 Add default settings to test env. Removed wrong comment for rack_profiler
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 12:44:29 +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 93cdf8a312 Enable SQL queries in mini-profiler
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 11:50:02 +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
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
Dmitriy Zaporozhets 1c7aecc8f5 Merge branch 'refacoring/selectors' into 'master'
Refacoring: Finders

Services -> change data
Finders -> select data
2014-02-25 19:25:32 +00: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 ffce379a67 Fix email test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:49:20 +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
Dmitriy Zaporozhets f7ca46b5a3 Dont test models methods in security specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:14:03 +02:00
Dmitriy Zaporozhets 6304428467 Merge branch 'shell_commands_guide' into 'master'
Shell Commands Guide
2014-02-25 14:56:23 +00: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 b6a934207c Update CAHNGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 15:39:55 +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
Jacob Vosmaer 38f4b61a58 Make it possible to call Gitlab::Popen.popen 2014-02-25 11:58:58 +01:00
Jacob Vosmaer 8016cefafe Make the Gitlab::Popen path argument optional 2014-02-25 11:58:22 +01:00
Jacob Vosmaer 0432bdf19e Change Gitlab::Popen to use arrays for commands 2014-02-25 11:57:42 +01:00
Jacob Vosmaer 4c746c2522 Add shell commands guide 2014-02-25 11:53:01 +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 e1c00d5300 Add 6.6.2 to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 10:54:07 +02:00
Dmitriy Zaporozhets 136316a92d Fix group ownership for dev seeds
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 10:44:29 +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 97ac3def1f Add public groups to change log 2014-02-24 19:41:10 +00: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