summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Fade out should be white instead of graysystem-notes-fadeAnnabel Dunstone Gray2016-12-071-1/+1
|
* Merge branch 'remove-pages-css' into 'master' Jacob Schatz2016-12-064-32/+2
|\ | | | | | | | | | | | | | | | | Remove more pages css * Moves award emojis to `/framework` * Moves generic image styles to `/framework` * Removes `confirmation.scss` See merge request !7952
| * Merge branch 'master' into 'remove-pages-css'remove-pages-cssAnnabel Dunstone Gray2016-12-0611-183/+122
| |\ | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework.scss
| * | Remove confirmation.scssAnnabel Dunstone Gray2016-12-061-32/+0
| | |
| * | Move award emojis to framworkAnnabel Dunstone Gray2016-12-062-0/+2
| | |
| * | Move image styles to frameworkAnnabel Dunstone Gray2016-12-061-0/+0
| | |
* | | Merge branch 'remove-dashboard-css' into 'master' Jacob Schatz2016-12-062-49/+0
|\ \ \ | |_|/ |/| | | | | | | | Remove dashboard.scss See merge request !7960
| * | Remove dashboard.scssAnnabel Dunstone Gray2016-12-062-49/+0
| |/
* | Merge branch 'remove-tags-scss' into 'master' Jacob Schatz2016-12-062-7/+10
|\ \ | | | | | | | | | | | | | | | | | | Remove tags.scss Remove `tags.scss` See merge request !7935
| * | Remove tags.scssremove-tags-scssAnnabel Dunstone Gray2016-12-062-7/+10
| |/
* | Merge branch 'admin-scss' into 'master' Jacob Schatz2016-12-069-176/+112
|\ \ | |/ |/| | | | | | | | | Remove admin.scss Removes admin-specific CSS See merge request !7932
| * Remove admin.scssadmin-scssAnnabel Dunstone Gray2016-12-058-128/+90
| |
| * Truncate fix, remove unneeded admin-specific cssAnnabel Dunstone Gray2016-12-054-48/+22
| |
* | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz2016-12-061-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MR widget content wrapping for XS viewports Centers the "Accept Merge Request" button within the MR widget (and adds a bit of right/left padding) for viewports smaller than 768px. BEFORE: ![Screen_Shot_2016-12-02_at_8_53_01_AM](/uploads/fcdae5302a1407090483dd3cff868c51/Screen_Shot_2016-12-02_at_8_53_01_AM.png) AFTER: ![Screen_Shot_2016-12-02_at_9_43_37_AM](/uploads/f7d1dce082b79d263f05cea3c90e870a/Screen_Shot_2016-12-02_at_9_43_37_AM.png) cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900
| * | Fixed MR widget content wrapping for XS viewportsRyan Harris2016-12-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button
* | | Merge branch 'remove-errors-scss' into 'master' Jacob Schatz2016-12-051-16/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused errors css `.error-page` isn't being used anywhere as far as I can see so I removed it See merge request !7933
| * | | Remove unused errors cssremove-errors-scssAnnabel Dunstone Gray2016-12-051-16/+0
| | | |
* | | | Remove unused votes.scssremove-votes-scssAnnabel Dunstone Gray2016-12-051-4/+0
|/ / /
* | | Merge branch '25221-fix-build-status-overflow-mobile' into 'master' Alfredo Sumaran2016-12-051-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed top margin for Builds page status header information Adds top margin for the Build Status content area for screens smaller than 768px. Especially needed when the text content wraps onto a third line. ![Untitled-1](/uploads/57a0a58f1fe647cd2d0dbb8849621340/Untitled-1.jpg) cc: @filipa @ClemMakesApps Closes #25221 See merge request !7917
| * | Fixed top margin for Builds page status header informationRyan Harris2016-12-031-0/+1
| | |
* | | Merge branch 'reduce-font-size' into 'master' Jacob Schatz2016-12-0513-19/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce base font sizes across app by 1px Looking at other websites that use system fonts, the default seems to be `14px`. We currently use `15px` which feels a little too big at the moment (in my opinion). This is just an idea so feel free to close it @awhildy :smile: Before: ![Screen_Shot_2016-12-02_at_1.46.25_PM](/uploads/4e287d3e66b1fe1dbac9999978594546/Screen_Shot_2016-12-02_at_1.46.25_PM.png) After: ![Screen_Shot_2016-12-02_at_1.46.02_PM](/uploads/09aed0952c25df214e8e5fb1404d6f4f/Screen_Shot_2016-12-02_at_1.46.02_PM.png) See merge request !7905
| * | | Reduce base font sizes across appreduce-font-sizeAnnabel Dunstone Gray2016-12-0213-19/+19
| | | |
* | | | Satisfied eslintSteffen Rauh2016-12-031-1/+1
| | | |
* | | | Fix compatibility with Internet Explorer 11 for merge requestsSteffen Rauh2016-12-032-3/+15
| |/ / |/| |
* | | satisfy eslint no-param-reassign rule23696-fix-diff-view-highlightingMike Greiling2016-12-022-8/+10
| | |
* | | display error when a tab cannot be loadedMike Greiling2016-12-021-1/+5
| | |
* | | use shorthand instead of length > 0 ↵Mike Greiling2016-12-021-1/+1
| | | | | | | | | | | | (http://airbnb.io/javascript/#comparison--shortcuts)
* | | use e instead of event variable nameMike Greiling2016-12-022-10/+10
| | |
* | | adjust scrollToElement to account for fixed merge request tabsMike Greiling2016-12-021-5/+7
| | |
* | | re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added ↵Luke Bennett2016-12-023-10/+32
| | | | | | | | | | | | | | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" Use url utility to retrieve hash
* | | fix eslint failures on Diff and MergeRequestTabsMike Greiling2016-12-022-64/+63
| | |
* | | remove array destructuring until we can fix babel configMike Greiling2016-12-021-2/+6
| | |
* | | refactor Diff class event bindingsMike Greiling2016-12-021-48/+48
| | |
* | | refactor Diff to es6 class syntaxMike Greiling2016-12-023-42/+35
| | |
* | | prefer es6 string interpolation over concatinationMike Greiling2016-12-021-27/+26
| | |
* | | refactor awkward bind workarounds into arrow functionsMike Greiling2016-12-021-69/+44
| | |
* | | refactor MergeRequestTabs to es6 class syntaxMike Greiling2016-12-022-90/+87
| | |
* | | fix diff line highlighting by moving method from the MergeRequestTabs class ↵Mike Greiling2016-12-022-42/+48
| | | | | | | | | | | | to the Diff class.
* | | temporarily revert "Added forceLoad ability to singleFileDiffs, added ↵Mike Greiling2016-12-022-28/+9
|/ / | | | | | | | | | | callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found" This reverts commit d2ee380816fa161d94da54c1f7e594c9a2ba2241.
* | Merge branch 'system-font-test' into 'master' Jacob Schatz2016-12-0228-140/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use system font Just for fun.... ### macOS Chrome (San Francisco): ![Screen_Shot_2016-11-17_at_4.01.29_PM](/uploads/bfbab440ea0136314a6a7cffcd44f3ff/Screen_Shot_2016-11-17_at_4.01.29_PM.png) ### macOS Safari (San Francisco): ![Screen_Shot_2016-11-18_at_8.28.22_AM](/uploads/3adc05d7adf84ca726cbaaf36cb0567d/Screen_Shot_2016-11-18_at_8.28.22_AM.png) #### Ubuntu Firefox (Ubuntu): ![Screen_Shot_2016-11-18_at_8.31.08_AM](/uploads/0f0d581d2d79d5db3dba9b2200499dc7/Screen_Shot_2016-11-18_at_8.31.08_AM.png) #### Windows 7 IE 11 (Segoe UI): ![Screen_Shot_2016-11-18_at_8.35.05_AM](/uploads/88efc2c554252de03fb84cc3c3e2856e/Screen_Shot_2016-11-18_at_8.35.05_AM.png) See merge request !7545
| * | Remove source sans prosystem-font-testAnnabel Dunstone Gray2016-12-0128-143/+1
| | |
| * | Use system fontAnnabel Dunstone Gray2016-12-011-1/+4
| | |
* | | Merge branch '25264-ref-commit' into 'master' Jacob Schatz2016-12-022-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ref property to commitRef ## What does this MR do? Changes `ref` prop to `commitRef` because `ref` is a reserved word in Vue.js ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25264 //cc @selfup See merge request !7901
| * | | Change prop name to keep consistency with other props.25264-ref-commitFilipa Lacerda2016-12-021-4/+4
| | | |
| * | | Adds changelog entryFilipa Lacerda2016-12-021-1/+1
| | | |
| * | | Change ref property to commitRefFilipa Lacerda2016-12-022-8/+8
| | |/ | |/|
* | | Merge branch 'cleanup-common_utils.js' into 'master' Alfredo Sumaran2016-12-024-64/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up common_utils.js ## What does this MR do? - Remove unused functions from `common_utils.js`. - Move functions which are used from only one file to that file. ## Why was this MR needed? Because some utils weren't that common (anymore). See merge request !7318
| * | | Clean up common_utils.js (!7318)winniehell2016-12-014-64/+29
| | | |
* | | | Enable ColorVariable in scss-lintSam Rose2016-12-0167-954/+1977
| |/ / |/| |
* | | Merge branch '24726-remove-across-gitlab' into 'master' Annabel Dunstone Gray2016-12-012-6/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24726 Remove Across GitLab from side navigation ## What does this MR do? Removes Across GitLab header from side navigation ## Screenshots (if relevant) Before: ![Screen_Shot_2016-12-01_at_11.09.12_AM](/uploads/7a8c32a1736a55e0baedf071c21e98db/Screen_Shot_2016-12-01_at_11.09.12_AM.png) After: ![Screen_Shot_2016-12-01_at_11.09.02_AM](/uploads/4d095ec6e4e756abf0301678bb40d59b/Screen_Shot_2016-12-01_at_11.09.02_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24726 See merge request !7883
View Lorry Controller Status