Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add password and user specfeature/user-audit-2 | James Lopez | 2017-06-09 | 2 | -1/+13 |
| | |||||
* | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master' | Filipa Lacerda | 2017-06-09 | 3 | -4/+22 |
|\ | | | | | | | | | | | | | Fixed dropdown filter input not focusing after transition Closes #33216 See merge request !12020 | ||||
| * | Fixed dropdown filter input not focusing after transitionissuable-sidebar-edit-button-field-focus | Phil Hughes | 2017-06-08 | 3 | -4/+22 |
| | | | | | | | | Closes #33216 | ||||
* | | Merge branch '33466-jobs-navigation-menu' into 'master' | Phil Hughes | 2017-06-09 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Highlight jobs menu when we are in jobs page Closes #33466 See merge request !12029 | ||||
| * | | Highlight jobs menu when we are in jobs page | Filipa Lacerda | 2017-06-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'port-post-receive-changes' into 'master' | Robert Speicher | 2017-06-08 | 2 | -37/+30 |
|\ \ | | | | | | | | | | | | | Refactor PostReceive worker to limit merge conflicts See merge request !11916 | ||||
| * | | Refactor PostReceive worker to limit merge conflictsport-post-receive-changes | Douglas Barbosa Alexandre | 2017-06-05 | 2 | -37/+30 |
| | | | |||||
* | | | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master' | Douwe Maan | 2017-06-08 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | Use RequestStore on MR show.json query count spec See merge request !12024 | ||||
| * | | | Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-spec | Oswaldo Ferreira | 2017-06-08 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge branch 'sh-clarify-graphql' into 'master' | Douwe Maan | 2017-06-08 | 1 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Clarify API V5 being a compatability layer on top of GraphQL See merge request !12030 | ||||
| * | | | | Clarify API V5 being a compatability layer on top of GraphQL | Stan Hu | 2017-06-08 | 1 | -3/+7 |
|/ / / / | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'master-security-update' into 'master' | Regis Boudinot | 2017-06-08 | 55 | -66/+1256 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Master security update See merge request !12025 | ||||
| * \ \ \ | Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵master-security-update | DJ Mountney | 2017-06-08 | 2 | -6/+10 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | master-security-update | ||||
| | * | | | | Update rename_system_namespace_spec to new validations.upstream-9-2-security | Bob Van Landuyt | 2017-06-08 | 1 | -5/+7 |
| | | | | | | |||||
| | * | | | | Make the uploader use the updated folder | Bob Van Landuyt | 2017-06-08 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-08 | 55 | -66/+1252 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue | ||||
| * | | | | | Merge branch 'upstream-9-2-security' into master-security-update | DJ Mountney | 2017-06-08 | 37 | -35/+983 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-07 | 55 | -66/+1252 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue | ||||
| * | | | | | | Merge branch '25934-project-snippet-vis' into 'security-9-2' | DJ Mountney | 2017-06-08 | 13 | -18/+206 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101 | ||||
| * | | | | | | Merge branch 'dz-api-x-frame' into 'security-9-2' | DJ Mountney | 2017-06-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict API X-Frame-Options to same origin See merge request !2103 | ||||
| * | | | | | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1' | DJ Mountney | 2017-06-08 | 2 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100 | ||||
| * | | | | | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2' | DJ Mountney | 2017-06-08 | 2 | -2/+41 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escapes html content before appending it to the DOM See merge request !2107 | ||||
* | | | | | | Merge branch 'evn-no-geo-either' into 'master' | Stan Hu | 2017-06-08 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab GEO also does not support mysql replication See merge request !11914 | ||||
| * | | | | | | Update per discussionevn-no-geo-either | ernstvn | 2017-06-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | GitLab GEO also does not support mysql replication | ernstvn | 2017-06-05 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch '25426-group-dashboard-ui' into 'master' | Douwe Maan | 2017-06-08 | 30 | -66/+1434 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group dashboard UI" Closes #25426 See merge request !11098 | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-ui | Alfredo Sumaran | 2017-06-08 | 181 | -825/+5667 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add tests when user has no direct acces to a group | Alfredo Sumaran | 2017-06-08 | 2 | -2/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | Align folder and carets on groups tree | Alfredo Sumaran | 2017-06-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Update URL when paginating groups | Alfredo Sumaran | 2017-06-08 | 1 | -1/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add missing aria-hidden attribute to i tags | Alfredo Sumaran | 2017-06-08 | 1 | -8/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix type casing | Alfredo Sumaran | 2017-06-08 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Do not show access type to a group if there’s no access | Alfredo Sumaran | 2017-06-08 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Display user access type for each group | Alfredo Sumaran | 2017-06-07 | 4 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds unit tests for this | ||||
| * | | | | | | | | Add feature tests for Dashboard Groups page | Alfredo Sumaran | 2017-06-07 | 1 | -19/+103 |
| | | | | | | | | | |||||
| * | | | | | | | | Expose human group access on GroupEntity | Douwe Maan | 2017-06-07 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Use group and project finders instead of direct ActiveRecord relations | Douwe Maan | 2017-06-07 | 2 | -12/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into 25426-group-dashboard-ui | Alfredo Sumaran | 2017-06-07 | 827 | -4715/+15044 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Address feedback | Alfredo Sumaran | 2017-06-07 | 6 | -3/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Turn off every event on beforeDestroy | Alfredo Sumaran | 2017-06-07 | 1 | -0/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add CHANGELOG entry | Alfredo Sumaran | 2017-06-07 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix failing spec | Alfredo Sumaran | 2017-06-07 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Restore code to make explore groups work | Alfredo Sumaran | 2017-06-07 | 4 | -1/+23 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Address feedback | Alfredo Sumaran | 2017-06-07 | 9 | -99/+167 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add rows hover state and improve layout for mobile | Alfredo Sumaran | 2017-06-06 | 3 | -60/+78 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Do not show spinner when fetching subgroups | Alfredo Sumaran | 2017-06-06 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Expose avatar URL for groups | Alfredo Sumaran | 2017-06-06 | 2 | -2/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove non existent bundle | Alfredo Sumaran | 2017-06-06 | 2 | -2/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Minor visual adjustments | Alfredo Sumaran | 2017-06-06 | 9 | -22/+80 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add json support to group members leave action in controller | Dmitriy Zaporozhets | 2017-06-06 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |