Commit Graph
14930 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a0c513bb4e Merge branch 'bump-gitlab-git' into 'master'
Bump gitlab_git to 7.1.2

For https://dev.gitlab.org/gitlab/gitlabhq/issues/2151

See merge request !1722
2015-03-18 17:58:56 +00:00
Dmitriy Zaporozhets fec5f807bb Merge branch 'new-branch-commits' into 'master'
List new commits for newly pushed branch in activity view.

When someone pushes commits, I want to see them, regardless if it's a new or existing branch. If it's a new branch, we compare with the default branch (usually master).

![Screen_Shot_2015-03-17_at_15.49.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4cb7e0d833bc83a30197db81d4b273bc/Screen_Shot_2015-03-17_at_15.49.13.png)

See merge request !1711
2015-03-18 17:47:02 +00:00
Dmitriy Zaporozhets 85d226e57f Bump gitlab_git to 7.1.2 2015-03-18 10:25:22 -07:00
Dmitriy Zaporozhets 1646bfc273 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 09:24:43 -07:00
Dmitriy Zaporozhets c31628fc00 Merge branch 'order_in_settings_page' into 'master'
Fix the order of signin and signup on features page.

See merge request !1720
2015-03-18 16:24:34 +00:00
Marin Jankovski ce8359c151 Fix the order of signin and signup on features page. 2015-03-18 08:25:50 -07:00
Douwe Maan 9d938fd77d List new commits for newly pushed branch in activity view. 2015-03-18 14:28:50 +01:00
Douwe Maan 1f21dfaeab Merge branch 'commit_calendar_activity' into 'master'
Extend commit calendar to actually show what commits were made on a date

## What does this MR do?
This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project.
It is based on the optimizations @dzaporozhets made for the calendar.

## Are there points in the code the reviewer needs to double check?
The UI and how the links are generated i guess. That feels hacky at the moment :/

## Screenshot:
![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png)

I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :)

See merge request !326
2015-03-18 13:05:07 +00:00
Douwe Maan 5c4d6606c7 Merge branch 'line_wrap_default' into 'master'
Enable line wrapping per default.

This MR enables line wrapping by default and removes the checkbox to toggle it.

Let's be honest, noone likes horizontal scrollbars.

/cc @dzaporozhets @DouweM As discussed yesterday. Please take a look. Did I miss something?
The change feels to easy 😄

See merge request !396
2015-03-18 13:01:32 +00:00
Hannes Rosenögger 120f032b1a enable line wrapping by default and remove the checkbox to change it 2015-03-18 08:46:53 +01:00
Hannes Rosenögger 9e5738b007 Extend the commit calendar to show the actual commits for a date 2015-03-18 08:42:42 +01:00
Dmitriy Zaporozhets dbd347bfa0 Merge branch 'fix_subscription' into 'master'
Fix public issue

See merge request !1717
2015-03-18 06:23:29 +00:00
Valery Sizov 847bd0d0e5 fix public issue 2015-03-18 02:16:10 -04:00
Dmitriy Zaporozhets 63d0bf1f5e Fix external wiki service 2015-03-17 22:59:45 -07:00
Dmitriy Zaporozhets 8aa2cd465c Merge branch 'refactor-css' 2015-03-17 22:57:58 -07:00
Dmitriy Zaporozhets 521785157b Remove to old GitLab colors for succes and primary 2015-03-17 22:48:00 -07:00
Dmitriy Zaporozhets 293553747a Cleanup bootstrap variable example file 2015-03-17 22:31:45 -07:00
Dmitriy Zaporozhets 2aaf685305 More use of sass variables. Reject flatly gray colors 2015-03-17 22:25:25 -07:00
Dmitriy Zaporozhets 066fb568e7 Align services like in EE for easier merging 2015-03-17 19:06:43 -07:00
Dmitriy Zaporozhets 0e70fbe333 Move CHANGELOG item to correct milestone 2015-03-17 19:01:36 -07:00
Dmitriy Zaporozhets 52acd2b45c Merge branch 'external_wiki' into 'master'
Add support for external wikis

## What does this MR do?
This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link.
Currently this is realised as a service.

## What Use Case does this MR solve?
In my Company we already have a wiki System (Confluence).
We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides.
This currently only leaves us two choices:
1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui.
2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one.

Both solutions are not really good.
So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab?
Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :)
This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki.

## Screenshot:
![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png)

See merge request !291
2015-03-18 02:00:36 +00:00
Dmitriy Zaporozhets cc4a3b6b62 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-17 18:38:37 -07:00
Dmitriy Zaporozhets aa4691acac Fix email template css for project moved emails 2015-03-17 18:38:10 -07:00
Dmitriy Zaporozhets b8b3f7f11c Merge branch 'css-vars' into 'master'
More actively use css variabled to prevent colors duplication

See merge request !1715
2015-03-18 01:37:04 +00:00
Dmitriy Zaporozhets 560a29e660 Merge branch 'replace-linux-with-gnu-linux' into 'master'
Replace linux with gnu linux

To recognize the work of Dr. Stallman.

See merge request !391
2015-03-18 01:26:39 +00:00
Dmitriy Zaporozhets f8c8d988e8 Fix scroll for last push widget 2015-03-17 18:13:20 -07:00
Dmitriy Zaporozhets d659c1d1fd More actively use css variabled to prevent colors duplication 2015-03-17 18:01:33 -07:00
Dmitriy Zaporozhets 5bbc70da9c Merge branch 'update-grack' into 'master'
Update Grack.

See merge request !1712
2015-03-18 00:15:04 +00:00
Dmitriy Zaporozhets d2979c778f Merge branch 'update-omniauth-ldap' into 'master'
Update omniauth-ldap.

See merge request !1713
2015-03-18 00:14:04 +00:00
Dmitriy Zaporozhets cb3b671839 Its time for 7.10.0.pre 2015-03-17 17:06:40 -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
Douwe Maan 16b7317669 Update omniauth-ldap. 2015-03-17 17:15:39 +01:00
Douwe Maan b27622a16f Update Grack. 2015-03-17 16:34:17 +01: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