Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' | Douwe Maan | 2016-07-15 | 2 | -6/+9 |
|\ | |||||
| * | Use cattr_accessor instead duplicating code on NoteOnDiff concern | Douglas Barbosa Alexandre | 2016-07-15 | 3 | -9/+9 |
| * | Fix mentioned users list on diff notes | Douglas Barbosa Alexandre | 2016-07-15 | 1 | -0/+3 |
* | | Merge branch 'fix-creating-group-with-space-in-group-path' | Douwe Maan | 2016-07-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix creating group with space in group path | Douglas Barbosa Alexandre | 2016-07-14 | 1 | -1/+1 |
* | | | Merge branch 'revert-lock-for-issuable' into 'master' | Robert Speicher | 2016-07-15 | 4 | -24/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuable | Stan Hu | 2016-07-13 | 4 | -24/+2 |
* | | | Merge branch 'collapse-diffs-more' into 'master' | Fatih Acet | 2016-07-15 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Change bg color of collapsed diff to blue on hovercollapse-diffs-more | Annabel Dunstone | 2016-07-14 | 1 | -0/+5 |
| * | | | Reduce padding on collapsed diff message | Sean McGivern | 2016-07-14 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master' | Fatih Acet | 2016-07-15 | 2 | -2/+6 |
|\ \ \ | |||||
| * | | | Changed collapsed assignee tooltip to users name | Phil Hughes | 2016-07-13 | 2 | -2/+6 |
* | | | | Merge branch 'fix-navbar-icon' into 'master' | Fatih Acet | 2016-07-15 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | navbar_icon was renamed to custom_icon in:fix-navbar-icon | Lin Jen-Shin | 2016-07-15 | 1 | -2/+2 |
* | | | | | Merge branch '4424-improve-ui-admin-area' into 'master' | Dmitriy Zaporozhets | 2016-07-15 | 7 | -54/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Add visibility icon4424-improve-ui-admin-area | Alfredo Sumaran | 2016-07-14 | 1 | -0/+3 |
| * | | | | | Remove previously introduced CSS that will not be used anymore | Alfredo Sumaran | 2016-07-14 | 1 | -23/+0 |
| * | | | | | Make admin/groups view consistent with dashboard/groups | Alfredo Sumaran | 2016-07-14 | 1 | -17/+20 |
| * | | | | | Fix New Group button spacing on mobile | Alfredo Sumaran | 2016-07-14 | 1 | -1/+1 |
| * | | | | | Make CSS consistent again | Alfredo Sumaran | 2016-07-14 | 3 | -11/+5 |
| * | | | | | Rename .group-controls to .controls | Alfredo Sumaran | 2016-07-14 | 2 | -3/+3 |
| * | | | | | Remove unnecesary CSS class | Alfredo Sumaran | 2016-07-14 | 2 | -2/+2 |
* | | | | | | Merge branch 'update-permissions-links' into 'master' | Achilleas Pipinellis | 2016-07-15 | 6 | -7/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Update permissons links to new pageupdate-permissions-links | Sean McGivern | 2016-07-14 | 6 | -7/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'update-branch-names-in-gc' into 'master' | Jacob Vosmaer (GitLab) | 2016-07-15 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Refresh branch cache after `git gc` | Stan Hu | 2016-07-13 | 1 | -1/+3 |
* | | | | | | Merge branch 'gl-dropdown-issuable-form' into 'master' | Jacob Schatz | 2016-07-15 | 11 | -53/+61 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Dropdown chevron alignmentgl-dropdown-issuable-form | Phil Hughes | 2016-07-07 | 1 | -1/+1 |
| * | | | | | | Updated tests | Phil Hughes | 2016-07-07 | 3 | -5/+5 |
| * | | | | | | GL dropdowns in issuable form | Phil Hughes | 2016-07-07 | 9 | -50/+58 |
* | | | | | | | Merge branch 'projects-blank-state' into 'master' | Jacob Schatz | 2016-07-15 | 7 | -82/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Dashboard projects blank stateprojects-blank-state | Phil Hughes | 2016-07-08 | 7 | -82/+56 |
* | | | | | | | | Merge branch 'compare-dropdowns' into 'master' | Jacob Schatz | 2016-07-15 | 6 | -16/+78 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fixed submit button not enablingcompare-dropdowns | Phil Hughes | 2016-07-08 | 1 | -1/+3 |
| * | | | | | | | Updated dropdowns to use field instead | Phil Hughes | 2016-07-08 | 9 | -40/+75 |
| * | | | | | | | Updated compare dropdowns | Phil Hughes | 2016-07-08 | 6 | -18/+43 |
* | | | | | | | | Add margin between buttons if both retry and cancel are present | Annabel Dunstone | 2016-07-14 | 2 | -6/+13 |
* | | | | | | | | Add margin between labels; remove underline hover style on status button | Annabel Dunstone | 2016-07-14 | 1 | -0/+12 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix/persistent-import-data' into 'master' | Fatih Acet | 2016-07-14 | 4 | -5/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | udpated JS based on feedbackfix/persistent-import-data | James Lopez | 2016-07-14 | 1 | -5/+2 |
| * | | | | | | | some JS magic to fix empty URL bug | James Lopez | 2016-07-13 | 2 | -2/+10 |
| * | | | | | | | updated create_or_update_import_data to use guard clause | James Lopez | 2016-07-13 | 1 | -1/+3 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-... | James Lopez | 2016-07-13 | 63 | -268/+484 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | fix more specs | James Lopez | 2016-07-13 | 1 | -1/+5 |
| * | | | | | | | fix specs | James Lopez | 2016-07-13 | 1 | -1/+1 |
| * | | | | | | | fixes a few issues to do with import_url not being saved correctly for import... | James Lopez | 2016-07-12 | 2 | -3/+3 |
* | | | | | | | | Merge branch 'project-files-header-cursor' into 'master' | Fatih Acet | 2016-07-14 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use default cursor for table header of project files (!5165) | winniehell | 2016-07-14 | 1 | -2/+1 |
* | | | | | | | | | Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master' | Fatih Acet | 2016-07-14 | 4 | -12/+20 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Review changeslbennett/gitlab-ce-18120-focus-filter-shortcut | Luke "Jared" Bennett | 2016-07-11 | 2 | -8/+9 |