Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove outline from dropdown toggles when dropdown open33469-focus | Simon Knox | 2017-06-10 | 2 | -1/+5 |
| | |||||
* | Merge branch 'port-post-receive-changes' into 'master' | Robert Speicher | 2017-06-08 | 1 | -21/+17 |
|\ | | | | | | | | | 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 | 1 | -21/+17 |
| | | |||||
* | | Merge branch 'master-security-update' into 'master' | Regis Boudinot | 2017-06-08 | 5 | -7/+31 |
|\ \ | | | | | | | | | | | | | 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 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | master-security-update | ||||
| | * | | 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 | 5 | -7/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -4/+21 |
| |\ \ \ | |||||
| | * | | | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-07 | 5 | -7/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101 | ||||
| * | | | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1' | DJ Mountney | 2017-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escapes html content before appending it to the DOM See merge request !2107 | ||||
* | | | | | Merge branch '25426-group-dashboard-ui' into 'master' | Douwe Maan | 2017-06-08 | 21 | -46/+1034 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 92 | -351/+492 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add tests when user has no direct acces to a group | Alfredo Sumaran | 2017-06-08 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | 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 | 2 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds unit tests for this | ||||
| * | | | | | | 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 | 363 | -1545/+4419 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Address feedback | Alfredo Sumaran | 2017-06-07 | 2 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | Turn off every event on beforeDestroy | Alfredo Sumaran | 2017-06-07 | 1 | -0/+8 |
| | | | | | | | | |||||
| * | | | | | | | Restore code to make explore groups work | Alfredo Sumaran | 2017-06-07 | 3 | -1/+22 |
| | | | | | | | | |||||
| * | | | | | | | Address feedback | Alfredo Sumaran | 2017-06-07 | 6 | -70/+113 |
| | | | | | | | | |||||
| * | | | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | Minor visual adjustments | Alfredo Sumaran | 2017-06-06 | 7 | -20/+78 |
| | | | | | | | | |||||
| * | | | | | | | Add json support to group members leave action in controller | Dmitriy Zaporozhets | 2017-06-06 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Improve pagination when searching or filtering | Alfredo Sumaran | 2017-06-06 | 7 | -48/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui | Dmitriy Zaporozhets | 2017-06-02 | 1023 | -8343/+19443 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | | Use eventHub to update groups from GroupFilterableList class | Alfredo Sumaran | 2017-06-01 | 4 | -22/+46 |
| | | | | | | | | | |||||
| * | | | | | | | | Make GroupsStore.store method non-static | Alfredo Sumaran | 2017-06-01 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Move line to a better place | Alfredo Sumaran | 2017-05-31 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Use webpack_bundle_tag instead of deprecated page_specific_javascript_bundle_tag | Alfredo Sumaran | 2017-05-31 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Use map to iterate arrays | Alfredo Sumaran | 2017-05-31 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove default null value for parent param | Alfredo Sumaran | 2017-05-31 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove unnecesary return | Alfredo Sumaran | 2017-05-31 | 1 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix JS error when filtering by option | Alfredo Sumaran | 2017-05-31 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Move eslint disable rule close to offending line to conform styleguide | Alfredo Sumaran | 2017-05-31 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove duplicated line | Alfredo Sumaran | 2017-05-31 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Restore accidentally deleted code | Alfredo Sumaran | 2017-05-31 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Declare store and service inside Vue app | Alfredo Sumaran | 2017-05-31 | 1 | -24/+29 |
| | | | | | | | | | |||||
| * | | | | | | | | Use object destructuring when passing more than 3 params to follow style guide | Alfredo Sumaran | 2017-05-31 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Replace v-show with v-if to conform style guide | Alfredo Sumaran | 2017-05-31 | 1 | -10/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Update i tags so they are not self closed | Alfredo Sumaran | 2017-05-31 | 1 | -2/+2 |
| | | | | | | | | |