summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Update mail_room to 0.8.0 to resolve #13357update-mail_room-to-0.8.0Lin Jen-Shin2016-06-212-3/+3
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Which includes the fix from: https://github.com/tpitale/mail_room/pull/73
* | | | | | | | | | | | | | | | Merge branch '18533-graphs-wiki-subnav' into 'master' Dmitriy Zaporozhets2016-06-2116-233/+261
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Graphs and Wiki subnav" ## What does this MR do? Styles sub nav in `Wiki` and `Graphs` ## What are the relevant issue numbers? Closes #18533 ## Screenshots (if relevant) ![Screen_Shot_2016-06-15_at_9.32.43_AM](/uploads/111dae6e1b9c7d8038ac88b9be6f76a2/Screen_Shot_2016-06-15_at_9.32.43_AM.png) cc @dzaporozhets See merge request !4678
| * | | | | | | | | | | | | | | Merge branch 'master' into 18533-graphs-wiki-subnavDmitriy Zaporozhets2016-06-2227-115/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | Merge branch 'rename-code-to-repo' into 'master' Dmitriy Zaporozhets2016-06-215-24/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Code tab to Repository As discussed in #18830, this renames the "Code" tab to "Repository". Screenshot now: ![image](/uploads/a7807dfb5b42f037fe2a44475a4af883/image.png) See merge request !4807
| * | | | | | | | | | | | | | | | Rename Repo -> Repositoryrename-code-to-repoStan Hu2016-06-215-24/+24
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Rename Code -> Repo in feature specsStan Hu2016-06-202-18/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Rename Code tab to RepoStan Hu2016-06-203-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18830
* | | | | | | | | | | | | | | | | Merge branch 'contributors-graph-mobile' into 'master' Jacob Schatz2016-06-212-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply responsive design for Contributors graphs. ## What does this MR do? Makes the Contributors graphs work on mobile. ## Are there points in the code the reviewer needs to double check? That this doesn't break on any screen sizes. ## Why was this MR needed? It used to be squished and impossible to read. ## What are the relevant issue numbers? Fixes #18845. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-18_at_1.00.58_PM](/uploads/bc17df5dabed0085c8ffdca303a502a5/Screen_Shot_2016-06-18_at_1.00.58_PM.png) After: ![Screen_Shot_2016-06-20_at_9.21.03_AM](/uploads/a0307cb255646800d0e4c8647769f7b6/Screen_Shot_2016-06-20_at_9.21.03_AM.png) cc: @jschatz1 See merge request !4801
| * | | | | | | | | | | | | | | | Apply responsive design for Contributors graphs.contributors-graph-mobileConnor Shea2016-06-202-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18845.
* | | | | | | | | | | | | | | | | Merge branch '18934-compare-gray-block' into 'master' Jacob Schatz2016-06-213-19/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gray block under subnav to match other pages ## What does this MR do? Makes Compare sub nav full width; replaces gray block with white one to match rest of pages ## What are the relevant issue numbers? Closes #18934 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_1.14.46_PM](/uploads/43377efe7816b854f48966bcbd96a1cc/Screen_Shot_2016-06-21_at_1.14.46_PM.png) cc @dzaporozhets See merge request !4838
| * | | | | | | | | | | | | | | | Update gray block under subnav to match other pages18934-compare-gray-blockAnnabel Dunstone2016-06-213-19/+35
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update-browser-gem' into 'master' Robert Speicher2016-06-212-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update browser gem to 2.2.0 A user with a certain browser would hit an Error 500: ``` ArgumentError: invalid value for Float(): "0." from browser/accept_language.rb:45:in `Float' from browser/accept_language.rb:45:in `quality' from browser/accept_language.rb:15:in `each' from browser/accept_language.rb:15:in `sort_by' from browser/accept_language.rb:15:in `parse' from browser/base.rb:13:in `initialize' from browser.rb:125:in `new' from browser.rb:125:in `block in new' from browser.rb:125:in `map' from browser.rb:125:in `new' from browser/action_controller.rb:15:in `browser' from abstract_controller/helpers.rb:67:in `browser' from app/views/layouts/_head.html.haml:38:in `_app_views_layouts__head_html_haml__1626593241142487258_59224880' ``` The root cause when the `Accept-Language` header would contain a float for the quality value (e.g. en-GB,en;q=0.v5). Fixes https://github.com/fnando/browser/issues/241 Seen today via Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/7644/ See merge request !4811
| * | | | | | | | | | | | | | | | | Update browser gem to 2.2.0Stan Hu2016-06-202-3/+3
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/fnando/browser/issues/241
* | | | | | | | | | | | | | | | | Merge branch '17671-private-forks-list-ui-issues' into 'master' Robert Speicher2016-06-212-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed private forks notice position in forks list Moves the private forks notification item into the list on the forks page. Closes #17671. See merge request !4573
| * | | | | | | | | | | | | | | | | Moved private forks notice to projects-list so its above the pagination and ↵Luke "Jared" Bennett2016-06-102-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inline with list Updated CHANGELOG Removed CHANGELOG entry
* | | | | | | | | | | | | | | | | | Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-214-12/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pre_process into render_result This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`. The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details. See merge request !4830
| * | | | | | | | | | | | | | | | | | Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-214-12/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method Banzai::Renderer.pre_process would always be called, regardless of whether the Markdown to render was already cached or not. In cache the document _was_ cached the output of the pre-processing pipeline was ignored resulting in it doing nothing but wasting CPU cycles. This commit moves Banzai::Renderer.pre_process into Banzai::Renderer.render_result so that it's _only_ used when needed.
* | | | | | | | | | | | | | | | | | Merge branch 'add_link_to_sidekiq_api' into 'master' Achilleas Pipinellis2016-06-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing link to sidekiq metrics in API README See merge request !4837
| * | | | | | | | | | | | | | | | | | Add missing link to sidekiq metrics in API READMEAchilleas Pipinellis2016-06-211-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch 'selector-refactor' into 'master' Jacob Schatz2016-06-211-14/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery selector refactor in application.js. Minor refactor for unnecessarily repeated `$(document)` `$(window)` and `$('body')` See merge request !4809
| * | | | | | | | | | | | | | | | | jQuery selector refactor in application.js.selector-refactorFatih Acet2016-06-211-14/+19
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'nav-count-alignment-ff' into 'master' Jacob Schatz2016-06-211-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with navbar counts being misaligned ## What does this MR do? Fixes an issue in FireFox with the number counts being mis-aligned. ## What are the relevant issue numbers? Closes #18916 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_15.56.51](/uploads/1d07543c14215e9e15facacc96aa3564/Screen_Shot_2016-06-21_at_15.56.51.png) See merge request !4829
| * | | | | | | | | | | | | | | | | Fixed issue with navbar counts being misalignednav-count-alignment-ffPhil Hughes2016-06-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18916
* | | | | | | | | | | | | | | | | | Merge branch 'fix-button-title' into 'master' Jacob Schatz2016-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize button text Capitalizes button text to match the rest. See merge request !4834
| * | | | | | | | | | | | | | | | | | Capitalize button textfix-button-titleAlfredo Sumaran2016-06-211-1/+1
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'dz-fix-appearance-preview' into 'master' Jacob Schatz2016-06-213-28/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix admin appearance settings preview Render appearance settings preview in devise layout instead of implementing it 2 times. See merge request !4792
| * | | | | | | | | | | | | | | | | | Fix admin appearance settings previewdz-fix-appearance-previewDmitriy Zaporozhets2016-06-203-28/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | Merge branch 'date-picker-hover' into 'master' Jacob Schatz2016-06-211-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed hover of date picker calendar ## What does this MR do? Fixes the hover styling of days on the datepicker dropdown in the issuable sidebar. ## Screenshots (if relevant) ![hover](/uploads/2514dc772187da33c54f8b6324202189/hover.gif) See merge request !4786
| * | | | | | | | | | | | | | | | | | Fixed hover of date picker calendardate-picker-hoverPhil Hughes2016-06-201-4/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '18854-prio-labels-on-mobile' into 'master' Jacob Schatz2016-06-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes labels view on mobile ## What does this MR do? Fixes priority labels view on mobile ## What are the relevant issue numbers? Fixes #18854 ## Screenshots (if relevant) <img src="/uploads/f75be3a2788858f12a63820559f20886/Screen_Shot_2016-06-20_at_2.23.26_PM.png" width="487"> See merge request !4806
| * | | | | | | | | | | | | | | | | | Fixes labels view on mobile18854-prio-labels-on-mobileAlfredo Sumaran2016-06-201-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Put wiki page history content into containerDmitriy Zaporozhets2016-06-211-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | | | | | | | | | * | | | | | | Add new page button to wiki home18533-graphs-wiki-subnavAnnabel Dunstone2016-06-211-0/+3
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Move new page link out of sub navAnnabel Dunstone2016-06-213-7/+5
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Add new style for sub header block infoAnnabel Dunstone2016-06-218-11/+18
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Fix graph columnsAnnabel Dunstone2016-06-212-5/+14
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Update CHANGELOGAnnabel Dunstone2016-06-211-0/+1
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Style wiki sub nav linksAnnabel Dunstone2016-06-217-84/+95
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | Style sub nav links in GraphsAnnabel Dunstone2016-06-215-107/+118
| |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fix/import-sources' into 'master' Robert Speicher2016-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing import source I realised https://gitlab.com/projects/new is missing the `gitlab export` option, while this worked fine in GDK it seems that something was missing here. This _should_ fix it unless I'm missing any other `import_sources` (did a grep and couldn't find it anywhere else though). See merge request !4825
| * | | | | | | | | | | | | | | | | add missing import sourcefix/import-sourcesJames Lopez2016-06-211-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'li-fade'Dmitriy Zaporozhets2016-06-216-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799
| * | | | | | | | | | | | | | | | Add fade divs as li elementsli-fadeAnnabel Dunstone2016-06-206-12/+12
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '18787-user-img-compare' into 'master' Dmitriy Zaporozhets2016-06-212-25/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align avatar and commit content within commit row ## What does this MR do? Aligns the user avatar on `Compare` ## What are the relevant issue numbers? Closes #18787 ## Screenshots (if relevant) <img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px"> <img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px"> See merge request !4764
| * | | | | | | | | | | | | | | | Align avatar and text within commit row18787-user-img-compareAnnabel Dunstone2016-06-202-25/+34
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-2127-97/+191
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz2016-06-216-11/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with notification dropdown not updating active ## What does this MR do? This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success. ## What are the relevant issue numbers? Closes #18480 ## Screenshots (if relevant) ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif) See merge request !4615
| | * | | | | | | | | | | | | | | | Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-212-4/+2
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fixed notification testsPhil Hughes2016-06-211-2/+2
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fixed issue with notification dropdownn not updating activePhil Hughes2016-06-213-5/+6
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes bell icon to spinner to show the action is happening Removed the flash message Closes #18480
View Lorry Controller Status