14927 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 16d6f0e35b Version 7.9.0 v7.9.0 2015-03-20 17:11:11 -07:00
Marin JankovskiandDmitriy Zaporozhets 3b1842f67b Fix typo. 2015-03-20 16:28:11 -07:00
Marin JankovskiandDmitriy Zaporozhets d9415bf9c2 Change the name of the key used for bitbucket importer. 2015-03-20 16:28:11 -07:00
Dmitriy Zaporozhets 452ffd46f3 Fix votes inline rendering 2015-03-20 15:35:04 -07:00
Dmitriy Zaporozhets 7cd053b50a Improve issue sidebar position 2015-03-20 15:34:56 -07:00
Dmitriy Zaporozhets d9d1dc99bc Fix commits routing 2015-03-20 13:37:37 -07:00
Dmitriy Zaporozhets 6e4ee0df3c Make issue and merge request sidebar more compact
* move votes block to participants
* make smaller font in sidebar
2015-03-20 13:20:35 -07:00
Dmitriy Zaporozhets e494adc284 Remove upvotes js logic since it does not work as expected anyway 2015-03-20 13:20:19 -07:00
Dmitriy Zaporozhets 86fc054e14 Fix project name overflow on dashboard 2015-03-20 11:28:58 -07:00
Dmitriy Zaporozhets 5909e5f6b2 Revert "Increase timeout for Git-over-HTTP requests."
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
2015-03-19 22:47:46 -07:00
Marin JankovskiandDmitriy Zaporozhets ec746368f1 Remove mention of branch to commit to. 2015-03-19 22:46:07 -07:00
Marin Jankovski 68dcfabfe6 Version 7.9.0.rc3 v7.9.0.rc3 2015-03-19 12:38:24 -07:00
Marin Jankovski 9e0715c0a3 Merge branch '7-9-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-9-stable 2015-03-19 10:32:18 -07:00
Dmitriy ZaporozhetsandMarin Jankovski ab83fb992b Merge branch 'add_canceled_ci_status' into 'master'
Add canceled CI status

Fixes https://github.com/gitlabhq/gitlab-ci/issues/564

https://dev.gitlab.org/gitlab/gitlab-ci/issues/169

![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png)

See merge request !1729
2015-03-19 10:29:48 -07:00
Dmitriy Zaporozhets 91c65d03b5 Merge branch 'commits_in_push_data' into '7-9-stable'
Commits in push data should always be an array.

See merge request !1726
2015-03-19 17:22:46 +00:00
Dmitriy ZaporozhetsandMarin Jankovski 1ea6b05e87 Merge branch 'rake_backup' into 'master'
Backup repo with tar instead of git bundle

Fixes gitlab/gitlab-ee#246

See merge request !1723
2015-03-19 10:19:14 -07:00
Marin Jankovski d793de7ad7 Commits in push data should always be an array. 2015-03-18 23:32:57 -07:00
Dmitriy Zaporozhets 1667861ed2 Fix link to project from fork 2015-03-18 17:42:53 -07:00
Dmitriy Zaporozhets e716e4377f Version 7.9.0.rc2 v7.9.0.rc2 2015-03-18 14:23:06 -07:00
Douwe MaanandDmitriy Zaporozhets 8b17fcb897 Fix condensed range in MR push comment. 2015-03-18 14:08:22 -07:00
Marin JankovskiandDmitriy Zaporozhets 09657f1071 Move application setting to separate variable. 2015-03-18 14:04:29 -07:00
Vinnie OkadaandDmitriy Zaporozhets 33d5a60571 Handle nil restricted visibility settings
Return `true` from `non_restricted_level?` when the
`restricted_visibility_levels` setting is nil.
2015-03-18 14:04:17 -07:00
Dmitriy Zaporozhets c0524574c8 Bump gitlab_git to 7.1.2 2015-03-18 10:59:35 -07:00
Marin JankovskiandDmitriy Zaporozhets 245f03cd61 Fix the order of signin and signup on features page. 2015-03-18 09:25:13 -07:00
Dmitriy Zaporozhets 301f5bfc85 Merge branch '7-9-rc2' into '7-9-stable'
Code for 7.9.0.rc2

cc @marin

See merge request !1719
2015-03-18 15:27:17 +00:00
Dmitriy Zaporozhets d71e2318f9 Fix scroll for last push widget 2015-03-17 23:33:56 -07:00
Dmitriy Zaporozhets e34d778f01 Merge branch 'refactor-css' 2015-03-17 23:28:51 -07:00
Dmitriy Zaporozhets b6e7940c3d Fix email template css for project moved emails 2015-03-17 23:27:51 -07:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets 368a391182 Merge branch 'css-vars' into 'master'
More actively use css variabled to prevent colors duplication

See merge request !1715
2015-03-17 23:27:17 -07:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets 2e2f9d3eed Merge branch 'fix_subscription' into 'master'
Fix public issue

See merge request !1717
2015-03-17 23:25:38 -07:00
Marin Jankovski 2fd9f1cc2b Version 7.9.0.rc1 v7.9.0.rc1 2015-03-17 16:23:43 -07:00
Marin Jankovski c6f57d73e0 Merge branch 'update_install_documentation' into 'master'
Update installation and upgrade documentation

See merge request !1714
2015-03-17 21:53:25 +00:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Douwe Maan 745aad4196 Merge branch 'fix_service_trigger_ui' into 'master'
Fix service UI

There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported.

Before:
![Screen Shot 2015-03-16 at 7.40.31 PM](https://gitlab.com/uploads/dblessing/gitlab-ce/0457a0b918/Screen_Shot_2015-03-16_at_7.40.31_PM.png)

I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time.

See merge request !395
2015-03-17 17:32:57 +00:00
Drew Blessing 6a269450e6 Fix UI bug regarding services 2015-03-17 12:09:26 -05:00
Dmitriy Zaporozhets 94238a9a7d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-17 09:49:55 -07:00
Dmitriy Zaporozhets bfc8ded120 Merge branch 'last-deploy-key' into 'master'
Delete deploy key when last connection to a project is destroyed.

Addresses #1959.

See merge request !1710
2015-03-17 16:49:38 +00:00
Dmitriy Zaporozhets 9162e34bb0 Merge branch 'issue_subscription' into 'master'
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
2015-03-17 16:45:04 +00:00
Valery Sizov 22fcb2f418 improve UI 2015-03-17 17:11:57 +02:00
Douwe Maan 7d2b34bd61 Satisfy Rubocop. 2015-03-17 16:00:32 +01:00
Douwe Maan 9c7fffb655 Delete deploy key when last connection to a project is destroyed. 2015-03-17 14:55:43 +01:00
Douwe Maan df91781a34 Fix changelog. 2015-03-17 10:09:49 +01:00
Douwe Maan e4ac6bbf82 Merge branch 'atom-xhtml-squashed' into 'master'
Fix invalid Atom feeds when using emoji, horizontal rules, or images

This is a fix for issues #880, #723, #1113.

Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like *img* and *hr* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images.

To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML.

I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one.

Thorough review appreciated since this is the first time I have used Ruby.

See merge request !344
2015-03-17 08:38:38 +00:00
Dmitriy Zaporozhets 409097bd7e Properly align save user profile button 2015-03-17 00:06:25 -07:00
Dmitriy Zaporozhets 3a324d9c6d Revert "Merge branch 'backup-permissions' into 'master'"
This reverts commit c42262b43b, reversing
changes made to c6586b1283.
2015-03-16 23:51:46 -07:00
Dmitriy Zaporozhets 84edc020b2 Fix button color inside alert 2015-03-16 23:44:30 -07:00
Dmitriy Zaporozhets 89ef79f8b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-16 19:14:21 -07:00
Dmitriy Zaporozhets c42262b43b Merge branch 'backup-permissions' into 'master'
Change permissions on backup files

Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.  See #1894.  Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600.

cc @sytse

See merge request !1703
2015-03-17 02:13:44 +00:00
Dmitriy Zaporozhets c6586b1283 Merge branch 'unicorn-workers' into 'master'
Documentation about unicorn settings.

Helps with https://news.ycombinator.com/item?id=9213180

See merge request !1704
2015-03-17 02:08:51 +00:00
Dmitriy Zaporozhets 3869bdf718 Merge branch 'relative-sematic-versioning' into 'master'
Relative sematic versioning

Note to indicate that semantic versioning is not absolute or allows you to fly blind.

See merge request !286
2015-03-17 00:47:18 +00:00