Commit Graph
6667 Commits
Author SHA1 Message Date
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""
This reverts commit 5a586f364c
2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' "
This reverts merge request !3191
2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master'
Support Golang subpackage fetching

Closes #13805

See merge request !3191
2016-03-12 17:38:08 +00:00
Stan Hu 2563213ccf Remove existing go_import.html.haml implementation 2016-03-12 07:49:16 -08:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master'
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
2016-03-11 19:58:10 +00:00
Jacob Schatz 3ed8a8e52c Merge branch 'search-results-filter-dropdown' into 'master'
Improved search results filter dropdown

## Current

Currently filter dropdowns on search results page can be **very** long and off the page

![Screen_Shot_2016-03-11_at_15.25.24](/uploads/3418b0a6f4f8a0a8bd2441b53502c574/Screen_Shot_2016-03-11_at_15.25.24.png)

## New

Changed over to the new dropdown

![Screen_Shot_2016-03-11_at_15.29.06](/uploads/2d3a4a9b3e50f3e0fc1748a026cd5905/Screen_Shot_2016-03-11_at_15.29.06.png)

See merge request !3183
2016-03-11 17:13:09 +00:00
Jacob Schatz 6968ea32e2 Merge branch 'award-emoji-design-update' into 'master'
Updated UI of award emoji

Closes #13878 

See merge request !3028
2016-03-11 16:06:18 +00:00
Phil Hughes 6c69868cfc Improved search results filter dropdown 2016-03-11 15:29:29 +00:00
Jacob Schatz 29ac9f64ea Merge branch 'fix-issue-toggle-button-mobile' into 'master'
Fixes issue with issue sidebar toggle button not working

Closes #14195

See merge request !3165
2016-03-11 13:09:54 +00:00
Jacob Schatz cec88d81bb Merge branch 'account-settings' into 'master'
Account settings

Closes #13854

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png)

See merge request !3039
2016-03-11 13:08:40 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master'
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
2016-03-11 13:07:43 +00:00
Jacob Schatz 0c5b92cbd7 Merge branch 'build-scroll-controls-position' into 'master'
Affix the build scroll controls

Closes #4709

See merge request !3109
2016-03-11 11:19:27 +00:00
Phil Hughes a9d97838a3 Added back 2fa configure later button 2016-03-11 09:51:07 +00:00
Phil Hughes 218f3e702a Moved 2fa into separate view 2016-03-11 09:51:07 +00:00
Phil Hughes c4baf2417f Fixed issue with 2fa not enabling
Added in disable button for 2fa
2016-03-11 09:51:07 +00:00
Phil Hughes d5f145bf8b Fixed failing tests 2016-03-11 09:51:07 +00:00
Phil Hughes f48f51ac7e Account settings
Closes #13854
2016-03-11 09:51:07 +00:00
Phil Hughes 5e145918b4 Updated UI of award emoji
Closes #13878
2016-03-11 09:02:43 +00:00
Phil Hughes 07e1754c7c Removed deprecated bootstrap classes 2016-03-11 08:57:53 +00:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Robert Speicher 5c1dba671d Merge branch 'issue-mr-build-status-placement' into 'master'
Moves build status tooltip on issues

See merge request !3156
2016-03-10 18:52:33 +00:00
Phil Hughes 145143ac7f Changed named argument
Set position to auto left so that if it is off-screen it goes to the right
2016-03-10 18:05:55 +00:00
Phil Hughes bc19acab25 Correct ruby code 2016-03-10 17:39:53 +00:00
Phil Hughes bd411675d2 Fixes issue with issue sidebar toggle button not working
Closes #14195
2016-03-10 17:34:06 +00:00
Jacob Schatz e080028570 Merge branch 'dropdown-js' into 'master'
Dropdown JS



See merge request !3112
2016-03-10 16:24:32 +00:00
Jacob Schatz 3d4063efa1 Merge branch 'download-button-flicker' into 'master'
Fixed flicker of download project button

Closes #14177

![download-button-flicker](/uploads/21e8ccc68ed66394c8ec65ca549f94ad/download-button-flicker.gif)

See merge request !3152
2016-03-10 15:20:17 +00:00
Jacob Schatz a1f4531069 Merge branch 'quick-submit-note-edit' into 'master'
Fixed quick submit on note edit

Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094

See merge request !3151
2016-03-10 14:34:03 +00:00
Jacob Schatz b9c9948ff8 Merge branch 'copy-markdown-snippet' into 'master'
Fixes issue with markdown snippet not being copyable

On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied

Closes #13882

See merge request !3153
2016-03-10 14:20:48 +00:00
Phil Hughes 8d7e0f0ba9 Fixed failing tests 2016-03-10 13:54:54 +00:00
Phil Hughes a9ea06ed29 Fixed ruby style errors 2016-03-10 13:54:54 +00:00
Phil Hughes 7744b67f75 Stops excute remote data fetcher when already recieved data 2016-03-10 13:54:54 +00:00
Phil Hughes dd35de1ad8 Uses a publicly facing URL so that it allows labels & milestones to be visible when not logged in 2016-03-10 13:54:54 +00:00
Phil Hughes 2e3c082f2a Status dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 75b21ebd75 Can create new label from dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 5cdac7614d Started page two for labels dropdown to allow creating new labels 2016-03-10 13:54:54 +00:00
Phil Hughes 8ca880c3b8 Correctly fitlers remotely 2016-03-10 13:54:54 +00:00
Phil Hughes 562a09c127 milestone dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes d6e5ed8a97 Extra links in label filter dropdown fotoer 2016-03-10 13:54:54 +00:00
Phil Hughes 11b52e287b Applied new dropdowns to issue filters 2016-03-10 13:54:54 +00:00
Phil Hughes 4407532911 GitLab dropdown JS 2016-03-10 13:54:54 +00:00
Dmitriy Zaporozhets 90ffb1c0db Fix header title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:35:23 +01:00
Phil Hughes 704f468376 Replaced hidden div for textarea off-the screen
Element with the content being copied cant be hidden so instead i\'ve moved it off the screen
2016-03-10 13:34:31 +00:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:29:38 +01:00
Phil Hughes 2cd401676f Moves build status tooltip on issues 2016-03-10 13:17:35 +00:00
Phil Hughes a0c4f3dfa9 Fixes issue with markdown snippet not being copyable
On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied

Closes #13882
2016-03-10 12:15:00 +00:00
Phil Hughes 573bbd674b Fixed flicker of download project button
Closes #14177
2016-03-10 11:52:31 +00:00
Phil Hughes 3c6fdc7a0a Fixed quick submit on note edit
Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094
2016-03-10 11:02:22 +00:00
Phil Hughes 22b89f35c7 Dropdown toggle button styling 2016-03-10 08:35:46 +00:00
Phil Hughes 8651137a4f Dropdown variables 2016-03-10 08:35:46 +00:00
Phil Hughes c6f516626d Added CSS for new dropdowns
See #3279 for the designs
2016-03-10 08:35:46 +00:00