home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,611 Commits 48 Branches 340 Tags
3be20afa9f7bfb4e4d13b30d5cfcd304b79ea478
Commit Graph
24611 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Schatz 3be20afa9f Merge branch 'audit-log-ui' into 'master' 
Audit log UI

Closes #13862

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a6d6d1c3661173b95df9ec95f8e2f644/audit-log-settings.png)

See merge request !3037
 2016-03-02 19:52:21 +00:00
Robert Speicher cbe8b70908 Merge branch 'patch-1' into 'master' 
Typo in API documentation

[ci skip]

See merge request !3058
 2016-03-02 17:43:05 +00:00
Rémy Coutable 2883d8b35d Add 8.5.2 items in CHANGELOG 
[ci skip]
 2016-03-02 18:25:02 +01:00
Robert Speicher 076956cb2b Merge branch 'issue_13501' into 'master' 
Add link to open merge requests on label index

Closes #13501 

See merge request !3057
 2016-03-02 17:18:03 +00:00
Phil Hughes 61c30061e7 audit log UI update 
Closes #13862
 2016-03-02 17:06:01 +00:00
Jacob Schatz 1fe9b93329 Merge branch 'profile-settings-ui' into 'master' 
Profile settings

Closes #13853 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4fb28f2598de6d9ca4e5be8595dbe863/profile-settings.png)

See merge request !3038
 2016-03-02 16:49:19 +00:00
Phil Hughes a03b0e1bda Changed link colour to match 2016-03-02 15:54:08 +00:00
Robert Speicher 84f158ebc8 Merge branch 'add_show_role_boolean_to_group_member_view' into 'master' 
Only show group member roles if explicitly requested

This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges.

In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE. 

## Before

![Screen_Shot_2016-03-01_at_8.59.02_AM](/uploads/704ab3149f60c363dd8374bd0c06a46a/Screen_Shot_2016-03-01_at_8.59.02_AM.png)

## After

![Screen_Shot_2016-03-01_at_9.17.54_AM](/uploads/5fcabef352cbc41dade037767f90ace3/Screen_Shot_2016-03-01_at_9.17.54_AM.png)

See merge request !3044
 2016-03-02 15:05:54 +00:00
Phil Hughes d767e7a181 Changed weight of labels 2016-03-02 15:05:49 +00:00
Rémy Coutable cb6af81670 Merge branch 'fix/13781-delete-tag-without-ajax' into 'master' 
Tag deletion doesn't use AJAX anymore



See merge request !2986
 2016-03-02 13:02:41 +00:00
Achilleas Pipinellis 77c7a0e9ee Merge branch 'docs_todos' into 'master' 
Add Todos documentation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884

See merge request !3064
 2016-03-02 12:37:29 +00:00
Achilleas Pipinellis 5ee049fcfb Add Todos documentation 
[ci skip]
 2016-03-02 14:33:47 +02:00
Douwe Maan 30be3cf5e2 Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master' 
Don't show "Welcome to GitLab" when the search didn't return any projects

Fixes #13785. /cc @pixdrift

### Before

![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png)

### After

![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png)

See merge request !3059
 2016-03-02 12:15:45 +00:00
Jacob Schatz 773718cbd3 Merge branch 'username-issue-header' into 'master' 
Added username to issue & merge request header

Closes #13771 

## Issue header

![Screen_Shot_2016-03-01_at_16.59.32](/uploads/a112dfb91eb9b6f911c716265b35043c/Screen_Shot_2016-03-01_at_16.59.32.png)

## Merge request header

![Screen_Shot_2016-03-01_at_16.59.26](/uploads/67bf9e65ac5cae4667db6c5148cb57a0/Screen_Shot_2016-03-01_at_16.59.26.png)

See merge request !3048
 2016-03-02 11:43:35 +00:00
Phil Hughes 7db585db11 Fixed heading weight 2016-03-02 11:41:52 +00:00
Phil Hughes e05f1ece91 Fixed failing profile tests 2016-03-02 11:41:52 +00:00
Phil Hughes 834eea0856 Profile settings 
Closes #13853
 2016-03-02 11:41:52 +00:00
Rémy Coutable f9ec33000d Use the .nothing-here-block class when projects list is empty 2016-03-02 12:11:08 +01:00
Douwe Maan 386d442a18 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' 
Fix permissions for deprecated CI build status badge

This fixes permissions for deprecated status badge, being unavailable even if project is public.

Closes #13324

See merge request !3030
 2016-03-02 11:00:25 +00:00
Douwe Maan 4eec96eb7a Merge branch 'issue_13623' into 'master' 
Show days remaining instead of elapsed time for Milestone.

Closes #13623

See merge request !2978
 2016-03-02 10:54:30 +00:00
Douwe Maan ca8a44be82 Merge branch 'issue_13716' into 'master' 
Check for conflicts before creating new revert branch

Fixes #13716 

See merge request !2953
 2016-03-02 10:51:43 +00:00
Douwe Maan 8eadb373ec Merge branch 'rs-filter-array' into 'master' 
Add FilterArray class to Banzai



See merge request !3053
 2016-03-02 10:46:23 +00:00
Douwe Maan 8ec49e47ec Merge branch 'mail-room-config-without-rails' into 'master' 
Don't load all of GitLab in mail_room

Fixes #12731

cc @jacobvosmaer 

See merge request !3005
 2016-03-02 10:43:57 +00:00
Rémy Coutable a3f0a176ff Don't show "Welcome to GitLab" when the search didn't return any projects 2016-03-02 11:41:35 +01:00
Achilleas Pipinellis c71c5876cb Merge branch 'fix/wrong-anchor-in-process' into 'master' 
Fix wrong anchor in PROCESS.md



See merge request !3060
 2016-03-02 10:23:01 +00:00
Rémy Coutable 62f518539c Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master' 
Fix import from gitlab.com fails

_Originally opened at !2896 by @kazsw._

- - -

Fixes #12652

CGI.escape encodes '/' by default.
Second argument can be removed.

See merge request !2988
 2016-03-02 10:19:20 +00:00
Rémy Coutable f8b13d2cc0 Fix wrong anchor in PROCESS.md 
[ci skip]
 2016-03-02 11:00:32 +01:00
bb-froggy 2af778c4fa typo 2016-03-02 09:42:14 +00:00
Kazuki SawadaandRémy Coutable fc170baf3f Fix import from gitlab.com 
Fixes #12652
 2016-03-02 10:35:44 +01:00
Rémy Coutable 1217b5b489 Merge branch 'shortcuts-help' into 'master' 
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
 2016-03-02 09:13:19 +00:00
Dmitriy Zaporozhets 5b0cada764 Merge branch 'rs-update-sprockets' into 'master' 
Bump sprockets to `~> 3.3.5`

Closes #6069

See merge request !3055
 2016-03-02 08:56:25 +00:00
Achilleas Pipinellis 07bc0b43b0 Merge branch 'notes_guidelines' into 'master' 
Change doc styleguide to use blockquotes for notes



See merge request !3009
 2016-03-02 08:00:33 +00:00
Achilleas Pipinellis 156642cfa4 Merge branch 'saml-doc-update' into 'master' 
Updated SAML and Omniauth docs

Updated SAML and Omniauth docs with information on the new behavior recently introduced in !2882

/cc @ernstvn @DouweM 

See merge request !2950
 2016-03-02 06:02:04 +00:00
Alfredo Sumaran c5df14ff98 Add link to open merge requests 2016-03-01 21:07:08 -05:00
Alfredo Sumaran d1b22c3a0b Add open_merge_requests_count method 2016-03-01 21:04:34 -05:00
Alfredo Sumaran 3992e2269b Add association to merge requests 2016-03-01 21:04:13 -05:00
Rubén Dávila 03d58f564c Little refactor for milestone_remaining_days helper from last code review. 2016-03-01 19:40:50 -05:00
Rubén Dávila 7773180219 Show days remaining instead of elapsed time for Milestone. 2016-03-01 19:40:50 -05:00
Rubén Dávila d9e0191592 Add some specs for Repository#revert. 2016-03-01 19:16:27 -05:00
Rubén Dávila 0c116d8ed6 Check for conflicts before creating target branch. 2016-03-01 19:16:27 -05:00
Robert Speicher 940d689d18 Bump sprockets to ~> 3.3.5 
Closes #6069
 2016-03-01 18:25:10 -05:00
Robert Speicher c9b1132217 Add FilterArray class to Banzai 2016-03-01 15:54:35 -05:00
Robert Speicher 6aa50165b0 Merge branch 'logged-out-search' into 'master' 
Logged out search

Fixes #13676  

See merge request !3045
 2016-03-01 19:57:10 +00:00
Drew Blessing 9b9abb1654 Only show group member roles if explicitly requested 2016-03-01 13:47:53 -06:00
Grzegorz Bizon 8b02d962ab Do not require authentication for CI status badge 
This changes only deprecated CI badge that we keep for backwards
compatibility. See !3030#note_4041498.
 2016-03-01 20:32:30 +01:00
Artem Sidorenko 8be19db9d4 Fix help keyboard shortcut for relative URL setups 2016-03-01 20:30:14 +01:00
Achilleas Pipinellis b8f8a55b8d Merge branch 'document-design-to-development-process' into 'master' 
Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.md

Closes gitlab-com/www-gitlab-com#544

See merge request !2983
 2016-03-01 19:22:37 +00:00
Patricio Cano 3f70c8f2db Style updates. 2016-03-01 13:51:47 -05:00
Dmitriy Zaporozhets 4c8721b25a Refactor UI header for logged out users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-01 19:31:52 +01:00
Rémy Coutable a6f26598bc Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.md 
Also, link to this new paragraph in PROCESS.md and improved a bit this
document.

[ci skip]
 2016-03-01 18:56:23 +01:00