home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c366e81da7 Improve docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:26:35 +01:00
Dmitriy Zaporozhets 0b68a0e79e Add API endpoint to fetch merge request commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:08:10 +01:00
Dmitriy Zaporozhets 0ccd7de7f3 Fix wrong doc in merge request API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 10:55:36 +01:00
Dmitriy Zaporozhets abf54f230e Merge branch 'ui/sidebar' into 'master' 
UI: Sidebar & header tweaks and fixes

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png)

![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png)

Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573

See merge request !1958
 2015-12-04 09:31:28 +00:00
Dmitriy Zaporozhets eb9601d906 Merge branch 'ui/form-consistency' into 'master' 
UI: Improve form consistency

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Tag form

Before:

![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png)

After:

![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png)


See merge request !1955
 2015-12-04 09:27:27 +00:00
Dmitriy Zaporozhets de3a175486 Merge branch 'ui/login-page' into 'master' 
Fix background and padding of login and error pages

Was gray, is white again.

See merge request !1978
 2015-12-04 09:24:42 +00:00
Achilleas Pipinellis 14010b9eff Merge branch 'doc-ssh' into 'master' 
Correction of markdown in SSH docs

Correction of broken markdown in SSH docs

See merge request !1900
 2015-12-04 08:48:03 +00:00
Jeff Stubler 932a7fd96f Merge branch 'master' into diverging-branch-graphs 2015-12-03 21:53:06 -06:00
Robert Speicher e9d06903da Merge branch 'fork-event' into 'master' 
Don't show project fork event as imported

See merge request !1949
 2015-12-03 23:52:34 +00:00
Robert Speicher 05d5485dd4 Merge branch 'new-tag-branch-authorization' into 'master' 
Add authorization to new branch/tag pages.

The create actions have authorization, the new actions didn't,
so no-one unauthorized could actually do anything, but it was wrong(TM).

See merge request !1979
 2015-12-03 23:46:55 +00:00
Robert Speicher bcf74d6e8c Merge branch 'fix-ruby-version' into 'master' 
Update .ruby-version to 2.1.7

Fixes #3835

See merge request !1980
 2015-12-03 23:39:17 +00:00
Kamil Trzciński 95fd79834a Merge branch 'ci_docker_docs' into 'master' 
fixes #3263 slashes are replaced with two underscores



See merge request !1981
 2015-12-03 22:49:40 +00:00
Kevin Pankonen 387e5656a1 fixes #3263 slashes are replaced with two underscores 2015-12-03 15:41:42 -07:00
Robert Schilling 83e6d8294f Update .ruby-version to 2.1.7 2015-12-03 23:14:19 +01:00
Douglas Barbosa Alexandre 0decc7f941 Fix specs 2015-12-03 19:46:30 -02:00
Drew Blessing 1481255efa Merge branch 'issue_3468_broken_link' into 'master' 
Fixed invalid link on starred projects dashboard.

Fixes #3468

The MR fixes 'Project' links on a dashboard pages headers. See the issue for the details.

This MR does not include tests since the change is rather trivial and there are no (as far as I have seen) existing tests for checking links validity.

In case tests are required I would like to get some guidance on the implementation first. At least I would like to know what should be covered: changed links, all header links, all navigation?

See merge request !1926
 2015-12-03 21:13:00 +00:00
Dmitriy Zaporozhets abb7261889 Merge branch 'ui/wiki' into 'master' 
UI: Use new style for wiki

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png)

After:

![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png)

## Edit Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png)

After:

![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png)

See merge request !1967
 2015-12-03 20:17:48 +00:00
Dmitriy Zaporozhets e7452c6b8f Merge branch 'ui/new-project' into 'master' 
UI: New Project form tweaks

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png)

After:

![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png)


See merge request !1964
 2015-12-03 19:46:47 +00:00
Dmitriy Zaporozhets 805b4cf522 Merge branch 'ui/issuable-filter' into 'master' 
UI: Issuable filter tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Filter bar

Before:

![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png)

After:

![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png)

## Bulk edit bar

Before:

![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png)

After:

![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png)


See merge request !1963
 2015-12-03 19:43:41 +00:00
Dmitriy Zaporozhets 15ea12859c Merge branch 'bugfix/star_cache' into 'master' 
Touch project when toggling stars to update cache

This is a fix for gitlab-org/gitlab-ce#3513.

When a star toggle event happens, we touch project to clear cache key.
This will trigger a new "updated_at" at the project model. If it's undesirable, please let me know and I will try to solve it in a different way.

See merge request !1970
 2015-12-03 19:23:45 +00:00
Anton Baklanov c5b6b31c84 Fixed invalid link on starred projects dashboard. 
Fixes #3468
 2015-12-03 21:06:15 +02:00
Douwe Maan e5c865eebf Fix specs 2015-12-03 20:01:35 +01:00
Gabriel Mazetto 82e916b0f2 Touch project when toggling stars to update cache 2015-12-03 16:08:08 -02:00
Douglas Barbosa Alexandre 9ca41f3ab2 Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group 2015-12-03 16:05:28 -02:00
Douwe Maan f9d954fae7 Satisfy rubocop 2015-12-03 19:02:56 +01:00
Douglas Barbosa Alexandre 510f3bf70b Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-comment 2015-12-03 16:00:05 -02:00
Douwe Maan e41a0c60f4 Add missing milestone ID 2015-12-03 18:59:03 +01:00
Douwe Maan 494ebad39b Fix spec 2015-12-03 18:56:43 +01:00
Douwe Maan a89d6d1428 Add authorization to new branch/tag pages. 2015-12-03 18:53:17 +01:00
Douwe Maan 1dd7c97886 Fix background and padding of login and error pages 2015-12-03 18:51:44 +01:00
Douwe Maan 5ab1b11e90 Fix specs 2015-12-03 18:42:37 +01:00
Dmitriy Zaporozhets 76f0054220 Merge branch 'ui/issuable-list-item' into 'master' 
UI: Issuable list item tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png)

After:

![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png)

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589

See merge request !1962
 2015-12-03 17:34:30 +00:00
Douwe Maan 0cbb7717df Fix spec 2015-12-03 18:32:29 +01:00
Douglas Barbosa Alexandre c204aca83b Improve style of the warning when mentioning many people in a comment 2015-12-03 15:30:10 -02:00
Dmitriy Zaporozhets d63d12a526 Merge branch 'ui/milestones' into 'master' 
UI: Use new style for milestone detail page

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.47.03](/uploads/62441f50963e0c5d6d04b065573c05f0/Screen_Shot_2015-12-02_at_17.47.03.png)

After:

![Screen_Shot_2015-12-02_at_17.47.22](/uploads/ab29ac0c1819415cc647be173f8c92bd/Screen_Shot_2015-12-02_at_17.47.22.png)


See merge request !1966
 2015-12-03 17:22:34 +00:00
Dmitriy Zaporozhets 68e27b5507 Merge branch 'ui/project-home-panel' into 'master' 
UI: Project home panel tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png)

After:

![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png)


See merge request !1965
 2015-12-03 17:20:55 +00:00
Marin Jankovski ea52a81da4 Move the file serving to Raw controller, add a few ifs to view. 2015-12-03 17:08:09 +01:00
Drew Blessing 11b54edf36 Filter current user to the top of issue assignee list 2015-12-03 09:36:45 -06:00
Phillip Berndt 86ed2e43d5 time_ago_with_tooltip javascript snippet: Don't reinitialize older elements 
see bug #3758
 2015-12-03 16:04:39 +01:00
Greg Smethells dbbd2b863b sort milestones by due_date 2015-12-03 08:53:34 -06:00
Rubén Dávila 5e6a5270d5 Raise the exception from #execute instead of #run_hook. #1156 #3069 2015-12-03 09:39:15 -05:00
Rubén Dávila 338eb2c41e Call update hook from new GitHooksService class. #3069 2015-12-03 09:39:15 -05:00
Rubén Dávila 5145706c82 Run custom Git hooks when creating or deleting branches through the UI. #1156 2015-12-03 09:39:15 -05:00
Valery Sizov 76b2250c60 Merge branch 'procfile' into 'master' 
The Procfile is for development only



See merge request !1950
 2015-12-03 14:37:52 +00:00
Jacob Vosmaer aba5506407 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into procfile 2015-12-03 15:21:28 +01:00
Dmitriy Zaporozhets b5103a83a8 Merge branch 'ui/emoji' into 'master' 
UI: Award emoji tweaks

Before:

![emoji_before](/uploads/82786924d3cea0313321b9dde0356cd2/emoji_before.png)

After:

![emoji_after](/uploads/07e94401701d7a622c3ed5cbaa148244/emoji_after.png)

See merge request !1960
 2015-12-03 14:10:49 +00:00
Marin Jankovski 0a081e7eff If a user clicks on the LFS object, it should be served if the user has access to the object. 2015-12-03 14:59:10 +01:00
Douwe Maan 90899b3208 Fix specs 2015-12-03 14:54:14 +01:00
Valery Sizov 9ce8c867ee Fix mailer queue 2015-12-03 15:10:41 +02:00
Douwe Maan 0de8e26066 Pass original text along with label reference filter. 2015-12-03 14:00:41 +01:00