home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 13:06:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,974 Commits 48 Branches 340 Tags
1481255efa653b036469a5c98fadd0ecdb46e5b0
Commit Graph
20974 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gabriel Mazetto 82e916b0f2 Touch project when toggling stars to update cache 2015-12-03 16:08:08 -02:00
Douwe Maan 494ebad39b Fix spec 2015-12-03 18:56:43 +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
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
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
Douwe Maan 97ddf2df00 Merge branch 'master' into ui/wiki 2015-12-03 13:29:35 +01:00
Douwe Maan e84edc20c3 Merge branch 'master' into ui/project-home-panel 2015-12-03 13:28:20 +01:00
Douwe Maan fc5afc60ac Merge branch 'master' into ui/new-project 2015-12-03 13:28:08 +01:00
Douwe Maan f3de9d784c Merge branch 'master' into ui/milestones 2015-12-03 13:27:11 +01:00
Douwe Maan 00ebe2239b Merge branch 'master' into ui/issuable-list-item 2015-12-03 13:26:02 +01:00
Douwe Maan ac8972668f Merge branch 'master' into ui/issuable-filter 2015-12-03 13:24:31 +01:00
Douwe Maan 535d9306c1 Merge branch 'master' into ui/emoji 2015-12-03 13:24:19 +01:00
Valery Sizov 6689224a90 Merge branch 'fix_master' into 'master' 
Fix failures in master



See merge request !1974
 2015-12-03 12:05:32 +00:00
Valery Sizov b871c38bf2 Fix failures in master 2015-12-03 13:21:30 +02:00
Dmitriy Zaporozhets b4b67b020a Merge branch 'deprecated_warnings' into 'master' 
Git rid of deprecated warnings after rails update

https://gitlab.com/gitlab-org/gitlab-ce/issues/3798

https://gitlab.com/gitlab-org/gitlab-ce/issues/3797

See merge request !1946
 2015-12-03 09:41:15 +00:00
Valery Sizov 843df4edd4 Merge branch 'test_fix' into 'master' 
Fix broken spec related to MySQL and fractional seconds support.



See merge request !1973
 2015-12-03 09:27:36 +00:00
Valery Sizov f21bbd4444 Rails deprecation warning about log_level 2015-12-03 10:53:58 +02:00
Valery Sizov 54b74aa998 fix Celluloid warnings 2015-12-03 10:49:02 +02:00
Valery Sizov 162cd0099c fix deprecation messages in tests 2015-12-03 10:33:43 +02:00
Rubén DávilaandValery Sizov f94afdbdb2 Fix broken spec related to MySQL and fractional seconds support. 2015-12-03 09:30:50 +02:00
Dmitriy Zaporozhets ca7e31c48f Merge branch 'ui/consistency' into 'master' 
UI: Improve consistency across the board

Depends on !1953

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

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577

See merge request !1954
 2015-12-02 22:17:48 +00:00
Dmitriy Zaporozhets bb76a9e2ea Merge branch 'ui/no-minimal-height' into 'master' 
UI: Remove minimum container height

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png)

After:

![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png)


See merge request !1957
 2015-12-02 22:15:38 +00:00
Dmitriy Zaporozhets 858e8903bf Merge branch 'ui/gl-padding' into 'master' 
UI: More consistent alignment and padding

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

# Highlights:

## Merge request form bottom

Before:

![mr_before](/uploads/de2ae608d300784b61818bc33538ac64/mr_before.png)

After: 

![mr_after](/uploads/9b1568d8287704ee9497cc029e827778/mr_after.png)

## Issue header

Before:

![issue_before](/uploads/e8cc4fb316219f025ff7bd74c7da8677/issue_before.png)

After:

![issue_after](/uploads/5fbad99f038571196c3c3c2bea304381/issue_after.png)

## Empty repository message

Before:

![empty_before](/uploads/f6ab80aea9af9111c3dc260d5fa98cd6/empty_before.png)

After:

![empty_after](/uploads/40a528f5a45f4e47776356c88aab24c4/empty_after.png)

Fixes #3742 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2594

See merge request !1953
 2015-12-02 22:14:42 +00:00
Hannes Rosenögger 5453eb7d79 Merge branch 'workhorse_in_patch_update' into 'master' 
Also update gitlab-workhorse in patch updates [ci skip]

Fixes #3747 

See merge request !1959
 2015-12-02 20:36:16 +00:00
Stan Hu cc52513367 Merge pull request #9873 from atomaka/atomaka/feature/prevent-blocked-impersonation 
Prevent impersonation if blocked
 2015-12-02 11:14:02 -08:00
Andrew Tomaka ec754d2213 Be more explicit with the impersonate return URL 2015-12-02 13:21:07 -05:00
Douwe Maan f10bd7df90 Tweak merge request list item 2015-12-02 17:37:06 +01:00
Job van der Voort efead2cf16 Merge branch 'fix_permission_doc' into 'master' 
fixed the documentation of the Guest role in permission.md

This MR fixes the documentation of the Guest role.  

closes gitlab-org/gitlab-ce#3777 

cc @dblessing @JobV 

See merge request !1952
 2015-12-02 15:26:44 +00:00
Douwe Maan 845f26d07b Remove minimum containe height 2015-12-02 15:49:21 +01:00
Douwe Maan 1fb3c0996a Fix styling of empty repo message 2015-12-02 15:32:45 +01:00
Hannes Rosenögger e3fe255c05 fixed the documentation of the Guest role in permission.md 2015-12-02 15:21:02 +01:00
Douwe Maan 854deae412 Brefer "Directory" over "Dir", "Files" over "Code 2015-12-02 14:56:17 +01:00
Douwe Maan 59c3ec4e67 Use file-type specific file icon in blame view and diff item 2015-12-02 14:55:36 +01:00
Douwe Maan a3da3d8e3b Use monospace font for commit SHA in branch list 2015-12-02 14:55:29 +01:00
Douwe Maan 90df3701e7 Add plus icon to all "Add X" buttons 2015-12-02 14:54:50 +01:00
Achilleas Pipinellis 0ec0c93824 Also update gitlab-workhorse in patch updates [ci skip] 2015-12-02 15:54:44 +02:00
Douwe Maan 40760d3f7b Add header title to import pages 2015-12-02 14:54:24 +01:00
Douwe Maan f8e577591b Don't use success state for "Download zip" button 2015-12-02 14:54:12 +01:00
Douwe Maan 12dd4c7c8a Use "Delete" in milestone and label delete buttons instead of "Remove" 2015-12-02 14:53:56 +01:00
Douwe Maan b8a926fab0 Don't use success state for explore projects search button 2015-12-02 14:53:28 +01:00