home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
22867 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 0566aa5129 spinach fixes 2015-12-04 14:25:26 +02:00
Valery Sizov 61e5f27f27 fix specs 2015-12-04 12:21:02 +02:00
Valery Sizov b84ee8d1b3 fix specs 2015-12-03 17:16:53 +02:00
Valery Sizov 7c091d701b Merge branch 'master' into ce_upstream 2015-12-03 14:09:00 +02: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
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
Douwe Maan e9e9f537e8 Truncate submodule commit SHAs to 7 characters 2015-12-02 14:53:20 +01:00
Douwe Maan 67ff47b39c Capitalize tab titles 2015-12-02 14:53:11 +01:00
Douwe Maan 080a0c026b Use same text color for commit box as issue title 2015-12-02 14:52:36 +01:00
Douwe Maan aec4b290fd Remove unused style 2015-12-02 14:51:37 +01:00
Douwe Maan 6ec9999a8e Use consistent border color 2015-12-02 14:51:25 +01:00
Douwe Maan ac389c6a3e Consistent styling for dashboard groups gray block 2015-12-02 14:51:10 +01:00
Douwe Maan 8196d269eb No bottom margin for form help blocks 2015-12-02 14:50:50 +01:00
Douwe Maan 09396b2eaa Render all form controls at the same height 2015-12-02 14:50:41 +01:00
Douwe Maan d5fd9b26b1 Remove style duplication between snippet and issue detail pages 2015-12-02 14:50:12 +01:00
Douwe Maan ba4bf27fe4 Use table-holder where appropriate 2015-12-02 14:49:59 +01:00
Douwe Maan 9ea7243092 Fix padding of no readme and empty repo messages 2015-12-02 14:49:46 +01:00
Douwe Maan 1c595681e5 Remove double border between gray blocks 2015-12-02 14:49:29 +01:00
Douwe Maan 3ad1d320ef Remove duplicated styling for center top menus 2015-12-02 14:49:12 +01:00
Douwe Maan 0159d78a3b Remove padding around form-actions 2015-12-02 14:48:06 +01:00
Douwe Maan aa01b23937 Fix padding around editor path, input and select box. 2015-12-02 14:47:19 +01:00
Douwe Maan c95b64d1ca Fix alignment of buttons in issue header 2015-12-02 14:46:55 +01:00
Douwe Maan 3ae7dba931 Use gl-padding instead of 15px/20px where appropriate 2015-12-02 14:46:15 +01:00
Douwe Maan 58dad2a9da Remove bottom margin from page-titles 2015-12-02 14:43:23 +01:00
Andrew Tomaka daca985a6e Prevent impersonation if blocked 2015-12-02 08:07:29 -05:00