summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
|\
| * Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13246-1064/+1148
| |\
| * | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
* | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
|\ \ \
| * | | Add missing `entityType`Kushal Pandya2018-06-131-1/+2
* | | | Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-134-6/+4
| |_|/ |/| |
* | | Merge branch 'fl-eslint-vue-house-keeping' into 'master'Tim Zallmann2018-06-13246-1064/+1148
|\ \ \ | |_|/ |/| |
| * | Fix broken tests due to bad conflict resolutionFilipa Lacerda2018-06-133-3/+3
| * | Updates eslint rulesFilipa Lacerda2018-06-136-23/+23
| * | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1322-42/+930
| |\ \
| * | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vueFilipa Lacerda2018-06-131-2/+1
| * | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-136-5/+11
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-1/+5
| |\ \ \
| * \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1211-17/+62
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-118-17/+36
| |\ \ \ \ \
| * | | | | | Updates eslint vue plugin versionFilipa Lacerda2018-06-11240-1042/+1123
* | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11-again' into 'master'Phil Hughes2018-06-131-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix incorrect nesting in scss for ie11André Luís2018-06-131-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Resolve "Bug: When creating an account with invalid characters the error is "...Jan2018-06-131-5/+4
* | | | | | Merge branch 'ide-commit-section-file-active-indicator' into 'master'Filipa Lacerda2018-06-135-5/+49
|\ \ \ \ \ \
| * | | | | | moved strings into constants fileide-commit-section-file-active-indicatorPhil Hughes2018-06-134-5/+17
| * | | | | | more karma fixesPhil Hughes2018-06-123-4/+9
| * | | | | | karma updatesPhil Hughes2018-06-121-4/+4
| * | | | | | Add active class to active file in IDE commit panelPhil Hughes2018-06-114-2/+29
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-131-1/+1
|\ \ \ \ \ \
| * | | | | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-121-1/+1
* | | | | | | Image Diff Viewing + Download Diff ViewingTim Zallmann2018-06-1317-31/+876
| |_|/ / / / |/| | | | |
* | | | | | Merge branch '46702-groups-members-no-padding-between-dropdowns-input' into '...Annabel Gray2018-06-131-4/+0
|\ \ \ \ \ \
| * | | | | | Fix group member filter layout46702-groups-members-no-padding-between-dropdowns-inputClement Ho2018-06-121-4/+0
* | | | | | | Resolve "Participants tooltip is cutoff when too close to the window edge"Clement Ho2018-06-121-0/+1
|/ / / / / /
* | | | | | Merge branch '47773-search-bar' into 'master'Clement Ho2018-06-121-0/+2
|\ \ \ \ \ \
| * | | | | | Align nav bar itemsAnnabel Dunstone Gray2018-06-121-0/+2
| |/ / / / /
* | | | | | Merge branch '47265-inputs-labels-alignment' into 'master'Clement Ho2018-06-121-0/+1
|\ \ \ \ \ \
| * | | | | | Remove top padding from .col-form-label47265-inputs-labels-alignmentAnnabel Dunstone Gray2018-06-111-0/+1
* | | | | | | Fix labels too largeLuke Bennett2018-06-121-1/+5
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-121-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-121-0/+1
* | | | | | mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-2/+6
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-123-3/+3
|\ \ \ \ \
| * | | | | Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsisAndreas Kämmerle2018-06-113-3/+3
* | | | | | Merge branch 'ide-project-img' into 'master'Filipa Lacerda2018-06-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix width of project avatar in Web IDEide-project-imgPhil Hughes2018-06-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'remove-favicon-blue.ico' into 'master'Douwe Maan2018-06-121-0/+0
|\ \ \ \ \
| * | | | | We already moved to png and this is no longer usedremove-favicon-blue.icoLin Jen-Shin2018-06-121-0/+0
| |/ / / /
* | | | | Merge branch 'fix-input-placeholder-color' into 'master'Annabel Gray2018-06-121-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix input placeholder text colorfix-input-placeholder-colorAndreas Kämmerle2018-06-111-1/+1
| | |/ / | |/| |
* | | | Merge branch '47245-hr-avatar' into 'master'Clement Ho2018-06-111-0/+4
|\ \ \ \
| * | | | Hide overflow on hrAnnabel Dunstone Gray2018-06-111-0/+4
* | | | | Merge branch '47604-avatars-and-system-icons-for-mobile' into 'master'Clement Ho2018-06-111-2/+2
|\ \ \ \ \
| * | | | | Make avatars/icons hidden on mobileTakuya Noguchi2018-06-081-2/+2
View Lorry Controller Status