summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Use gitlab-ui loading iconClement Ho2018-09-1161-244/+80
|
* Merge branch 'remove-unused-import' into 'master'Mike Greiling2018-09-111-4/+0
|\ | | | | | | | | Remove unused GlModal import in delete wiki modal See merge request gitlab-org/gitlab-ce!21677
| * Remove unused GlModal import in delete wiki modalClement Ho2018-09-111-4/+0
| |
* | Merge branch '51375-fix-activity-pages' into 'master'Robert Speicher2018-09-111-1/+1
|\ \ | |/ |/| | | | | | | | | Fix the group and project activity pages Closes #51375 See merge request gitlab-org/gitlab-ce!21674
| * Fix the group and project activity pagesNick Thomas2018-09-111-1/+1
| |
* | Add empty state illustration information in job APISteve Azzopardi2018-09-115-5/+13
| |
* | Merge branch '50632-combine-color-duplicates' into 'master'Clement Ho2018-09-1129-254/+59
|\ \ | | | | | | | | | | | | Resolve "[SCSS Variables Cleanup] Combine all duplicated hex colors in variables.scss", Part 1 See merge request gitlab-org/gitlab-ce!21375
| * | Remove jquery.scss; Combine multiple duplicate grays into global gray ↵Annabel Dunstone Gray2018-09-1129-254/+59
| | | | | | | | | | | | variables; Remove unused styles in common.scss
* | | Merge branch 'frozen-string-enable-vestigial' into 'master'Stan Hu2018-09-114-0/+8
|\ \ \ | |_|/ |/| | | | | | | | Enable frozen string in vestigial files See merge request gitlab-org/gitlab-ce!21665
| * | Enable frozen string in vestigial filesgfyoung2018-09-114-0/+8
| | | | | | | | | | | | Partially addresses #47424.
* | | Merge branch 'sh-support-adding-confirmed-emails' into 'master'Robert Speicher2018-09-112-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ability to skip user email confirmation with API Closes #50876 See merge request gitlab-org/gitlab-ce!21630
| * | | Add ability to skip user email confirmation with APIStan Hu2018-09-102-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives admins the ability to send a `skip_confirmation` flag in the `POST /users/:id/email` API endpoint to skip the verification step and assume the given e-mail address is verified. Closes #50876
* | | | Merge branch '50835-add-filtering-sorting-for-labels-on-labels-page' into ↵Dmitriy Zaporozhets2018-09-118-2/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add sorting for labels on labels page See merge request gitlab-org/gitlab-ce!21642
| * | | | Add sort dropdown to project labels page and group labels pageDmitriy Zaporozhets2018-09-108-2/+41
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-namespace-upload' into 'master'Kamil Trzciński2018-09-111-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix workhorse temp path for namespace uploads Closes gitlab-ee#7009 See merge request gitlab-org/gitlab-ce!21650
| * | | | Fix workhorse temp path for namespace uploadsJarka Košanová2018-09-111-0/+4
| | | | |
* | | | | Resolve "Filter bar height changes when items are added"Andrea Leone2018-09-111-2/+2
| | | | |
* | | | | Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'Grzegorz Bizon2018-09-111-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project export broken when avatar is set" Closes #51318 See merge request gitlab-org/gitlab-ce!21649
| * | | | fix avatar uploader errorJames Lopez2018-09-101-1/+1
| | | | |
* | | | | Rails 5: fix issue move serviceJasper Maes2018-09-111-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | In rails 5, the attributes method for an enum returns the name instead of the database integer.
* | | | add tooltip directive from gitlab-uiSimon Knox2018-09-102-6/+4
| | | |
* | | | Synchronize the default branch when updating a remote mirrorDouglas Barbosa Alexandre2018-09-103-2/+10
| |/ / |/| |
* | | Merge branch '48902-fix-diff-vertical-alignment' into 'master'Annabel Dunstone Gray2018-09-101-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix vertical alignment of text in diffs Closes #48902 See merge request gitlab-org/gitlab-ce!21573
| * | Fix vertical alignment of text in diffsPaul Slaughter2018-09-061-0/+1
| | | | | | | | | | | | - Adds changelog
* | | Merge branch 'lock-unlock-quick-actions' into 'master'Rémy Coutable2018-09-101-0/+24
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add /lock and /unlock quick actions Closes #39173 See merge request gitlab-org/gitlab-ce!15197
| * | Add /lock and /unlock quick actionsMehdi Lahmam2018-09-061-0/+24
| | | | | | | | | | | | Closes #39173
* | | Merge branch 'frozen-string-enable-app-helpers' into 'master'Rémy Coutable2018-09-10101-130/+316
|\ \ \ | | | | | | | | | | | | | | | | Enable frozen string for app/helpers/**/*.rb See merge request gitlab-org/gitlab-ce!21320
| * | | Enable frozen string for app/helpers/**/*.rbgfyoung2018-09-06101-130/+316
| | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | Resolve "On master, inline diff view contains extra `+` and `-` signs"Tim Zallmann2018-09-101-1/+2
| | | |
* | | | Merge branch '38208-due-dates-system-notes' into 'master'Stan Hu2018-09-094-2/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system note when due date is changed Closes #38208 See merge request gitlab-org/gitlab-ce!21628
| * | | | Add system note when due date is changedEva Kadlecová2018-09-094-2/+28
| | | | |
* | | | | Resolve "Merge requests show outdated discussions on changes tab"André Luís2018-09-084-6/+36
| | | | |
* | | | | Merge branch 'sh-fix-scope-error-container-repo' into 'master'Stan Hu2018-09-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix scoping errors occuring for ContainerRepository on some builds See merge request gitlab-org/gitlab-ce!21612
| * | | | | Fix scoping errors occuring for ContainerRepository on some buildsStan Hu2018-09-071-1/+1
| | | | | |
* | | | | | Resolve "Create new project: Re-add project name field"Martin Wortschack2018-09-085-16/+62
|/ / / / /
* | | | | Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-0727-426/+479
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Vue MR Page - Data structure update See merge request gitlab-org/gitlab-ce!21062
| * | | | | Fix for a check that fails if no file can be selectedTim Zallmann2018-09-081-42/+46
| | | | | |
| * | | | | Fix typo on targetLine in mutationAndré Luís2018-09-071-1/+1
| | | | | |
| * | | | | Cosmetic changes to let setupTim Zallmann2018-09-073-57/+48
| | | | | |
| * | | | | Adapted so utils + actions don't include any mutations and mutations are ↵Tim Zallmann2018-09-075-67/+78
| | | | | | | | | | | | | | | | | | | | | | | | always against state
| * | | | | Fixes based on MR discussion around naming, mutations, handling of stateTim Zallmann2018-09-0710-24/+22
| | | | | |
| * | | | | Made the discussion tests artificial to have them stable, mocked RAF + RICTim Zallmann2018-09-071-0/+1
| | | | | |
| * | | | | Added new tests for newly added mutations, actions, utilsTim Zallmann2018-09-073-9/+3
| | | | | |
| * | | | | Fixed another rspec about collapsing notes after adding themTim Zallmann2018-09-072-7/+8
| | | | | |
| * | | | | Fix Linting ErrorTim Zallmann2018-09-071-1/+0
| | | | | |
| * | | | | Removed Console.logTim Zallmann2018-09-071-2/+0
| | | | | |
| * | | | | Fix for Karma, Static Analysis and RSPec for MR PageTim Zallmann2018-09-073-32/+27
| | | | | |
| * | | | | Fixed Resolving, Loading more and Line BugsTim Zallmann2018-09-0711-95/+119
| | | | | |
| * | | | | Fix for displaying left side comments when no discussion availableTim Zallmann2018-09-072-6/+10
| | | | | |
| * | | | | Fixed Left side commentsTim Zallmann2018-09-072-3/+5
| | | | | |
View Lorry Controller Status