Commit Graph
8955 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fa7ee3ade8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 21:16:43 -07:00
Dmitriy Zaporozhets 3ab7933cc8 Merge branch 'improve-ui' into 'master'
Improve UI

* Improve group rename warning
* Refactor select css. Make selects same width

See merge request !400
2015-03-19 04:16:28 +00:00
Dmitriy Zaporozhets ba39ca9f4a Fix project name overflow on dashboard 2015-03-18 21:05:39 -07:00
Dmitriy Zaporozhets e25b1107c8 Refactor select css. Make selects same width 2015-03-18 20:46:26 -07:00
Dmitriy Zaporozhets b908d00f5b Improve group rename warning 2015-03-18 20:16:36 -07:00
Dmitriy Zaporozhets 1cf138170c Add tooltip for comment toggle in diff. Add changelog item and fix tests 2015-03-18 20:12:19 -07:00
Dmitriy Zaporozhets e07d32eb41 Add some space aroung diff stats block 2015-03-18 19:21:24 -07:00
Dmitriy Zaporozhets 22038106b4 Replace show diff button with link 2015-03-18 19:11:27 -07:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Dmitriy Zaporozhets e7e329d364 Fix link to project from fork 2015-03-18 16:17:30 -07:00
Dmitriy Zaporozhets 0eaabc2708 Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }"
This reverts commit 7602cef572.
2015-03-18 11:42:03 -07:00
Dmitriy Zaporozhets b5e961eb4c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 11:15:27 -07:00
Dmitriy Zaporozhets b5b2055cca Merge branch 'fix-mr-push-range' into 'master'
Fix condensed range in MR push comment.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1246

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/326#note_984907, you see that the compare page doesn't actually have 39 commits because we're using `first_new_commit^`, which is not always the same as `oldrev`. With this MR, we use `oldrev` instead, which will always work.

See merge request !1721
2015-03-18 18:15:24 +00:00
Douwe Maan 5994b036d2 Merge branch 'api-sort-merge-request-comments' into 'master'
Api: sort merge_request comments

Add default_scope { order(created_at: :asc, id: :asc) } in Note so comments are sorted when fetched through api.

See merge request !256
2015-03-18 18:08:40 +00:00
Dmitriy Zaporozhets d03d636304 Merge branch 'changelog-link' into 'master'
Add changelog, license and contribution guide links to project sidebar.

If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown.

![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png)

See merge request !1708
2015-03-18 18:02:39 +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 1646bfc273 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 09:24:43 -07:00
Samuel Bernard 7602cef572 Note: add default_scope { order(created_at: :asc, id: :asc) } 2015-03-18 17:06:17 +01:00
Douwe Maan ebfc7d052b Fix condensed range in MR push comment. 2015-03-18 16:37:29 +01:00
Marin Jankovski ce8359c151 Fix the order of signin and signup on features page. 2015-03-18 08:25:50 -07:00
Douwe Maan b1b8261f56 Add license and contribution guide links to project sidebar. 2015-03-18 16:17:43 +01:00
Douwe Maan 9d938fd77d List new commits for newly pushed branch in activity view. 2015-03-18 14:28:50 +01:00
Douwe Maan 5adb1128dc Show changelog link even if no version is known. 2015-03-18 14:08:26 +01:00
Douwe Maan d328b4166e Fix tree readme. 2015-03-18 14:08:26 +01:00
Douwe Maan 6581aea3bf Link project version to changelog if there is one. 2015-03-18 14:08:26 +01:00
Douwe Maan 31e484085a Find tree readme lazily. 2015-03-18 14:08:26 +01:00
Douwe Maan 88f9ed3d19 Move finding of contributing file from tree to repository. 2015-03-18 14:08:26 +01:00
Douwe Maan bf235053ad Send EmailsOnPush email when branch or tag is created or deleted. 2015-03-18 14:07:28 +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
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 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
Vinnie Okada feeffc4426 Merge branch 'master' into markdown-tags
Use the latest HTML pipeline gem
2015-03-17 20:53:09 -06:00
Dmitriy Zaporozhets 066fb568e7 Align services like in EE for easier merging 2015-03-17 19:06:43 -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 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 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
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