summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Improve method names and add more specsissue_20900Felipe Artur2017-06-138-20/+21
|
* Remove old specs and add new onesFelipe Artur2017-06-092-3/+7
|
* Order merge requests by priorityFelipe Artur2017-06-098-152/+10
|
* Order issues by priorityFelipe Artur2017-06-095-13/+15
|
* Remove Drag and drop and sorting from milestone viewFelipe Artur2017-06-096-74/+5
|
* Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-092-2/+2
|\ | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| * Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-072-2/+2
| | | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* | Remove nicescroll from job traceFilipa Lacerda2017-06-093-48/+59
| |
* | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-093-2/+12
|\ \ | | | | | | | | | | | | | | | | | | Fixed dashboard milestone tabs not loading Closes #33477 See merge request !12023
| * | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-093-2/+12
| | | | | | | | | | | | Closes #33477
* | | Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master'Sean McGivern2017-06-091-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display issue state in issue links section of merge request widget Closes #33381 See merge request !12021
| * | | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-linksAdam Niedzielski2017-06-091-2/+14
| | | |
* | | | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-093-13/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Detect if blob binaryness changes after loading all data See merge request !11981
| * | | | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-083-13/+22
| | | | | | | | | | | | | | | | | | | | binary afer loading all data
* | | | | Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'Filipa Lacerda2017-06-091-3/+15
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-focusPhil Hughes2017-06-081-3/+15
| | |/ / | |/| | | | | | | | | | Closes #33216
* | | | Highlight jobs menu when we are in jobs pageFilipa Lacerda2017-06-091-1/+1
| | | |
* | | | Merge branch 'port-post-receive-changes' into 'master'Robert Speicher2017-06-081-21/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor PostReceive worker to limit merge conflicts See merge request !11916
| * | | | Refactor PostReceive worker to limit merge conflictsport-post-receive-changesDouglas Barbosa Alexandre2017-06-051-21/+17
| | | | |
* | | | | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-085-7/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Master security update See merge request !12025
| * \ \ \ \ Merge remote-tracking branch 'origin/upstream-9-2-security' into ↵master-security-updateDJ Mountney2017-06-081-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | master-security-update
| | * | | | | Make the uploader use the updated folderBob Van Landuyt2017-06-081-1/+3
| | | | | | |
| | * | | | | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-085-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-updateDJ Mountney2017-06-082-4/+21
| |\ \ \ \ \ \
| | * | | | | | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-075-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 Mountney2017-06-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility when referencing snippets See merge request !2101
| * | | | | | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-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 Mountney2017-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escapes html content before appending it to the DOM See merge request !2107
* | | | | | | | Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-0821-46/+1034
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group dashboard UI" Closes #25426 See merge request !11098
| * \ \ \ \ \ \ \ Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-0892-351/+492
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add tests when user has no direct acces to a groupAlfredo Sumaran2017-06-081-2/+2
| | | | | | | | | |
| * | | | | | | | | Align folder and carets on groups treeAlfredo Sumaran2017-06-081-1/+1
| | | | | | | | | |
| * | | | | | | | | Update URL when paginating groupsAlfredo Sumaran2017-06-081-1/+6
| | | | | | | | | |
| * | | | | | | | | Add missing aria-hidden attribute to i tagsAlfredo Sumaran2017-06-081-8/+21
| | | | | | | | | |
| * | | | | | | | | Fix type casingAlfredo Sumaran2017-06-081-2/+2
| | | | | | | | | |
| * | | | | | | | | Do not show access type to a group if there’s no accessAlfredo Sumaran2017-06-081-0/+2
| | | | | | | | | |
| * | | | | | | | | Display user access type for each groupAlfredo Sumaran2017-06-072-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds unit tests for this
| * | | | | | | | | Expose human group access on GroupEntityDouwe Maan2017-06-071-2/+2
| | | | | | | | | |
| * | | | | | | | | Use group and project finders instead of direct ActiveRecord relationsDouwe Maan2017-06-072-12/+13
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-07363-1545/+4419
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Address feedbackAlfredo Sumaran2017-06-072-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Turn off every event on beforeDestroyAlfredo Sumaran2017-06-071-0/+8
| | | | | | | | | | |
| * | | | | | | | | | Restore code to make explore groups workAlfredo Sumaran2017-06-073-1/+22
| | | | | | | | | | |
| * | | | | | | | | | Address feedbackAlfredo Sumaran2017-06-076-70/+113
| | | | | | | | | | |
| * | | | | | | | | | Add rows hover state and improve layout for mobileAlfredo Sumaran2017-06-063-60/+78
| | | | | | | | | | |
| * | | | | | | | | | Do not show spinner when fetching subgroupsAlfredo Sumaran2017-06-061-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Expose avatar URL for groupsAlfredo Sumaran2017-06-062-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Minor visual adjustmentsAlfredo Sumaran2017-06-067-20/+78
| | | | | | | | | | |
| * | | | | | | | | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Improve pagination when searching or filteringAlfredo Sumaran2017-06-067-48/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
View Lorry Controller Status