summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated text expander text colorcommits-uiPhil Hughes2016-06-091-1/+1
|
* Fixed horizontal and veritcal alignment of commit action buttonsPhil Hughes2016-06-081-4/+18
|
* Changed margin to better align verticallyPhil Hughes2016-06-081-1/+1
|
* Vertical alignment of buttons in commit rowPhil Hughes2016-06-082-4/+4
|
* Added short commit ID to mobilePhil Hughes2016-06-082-4/+3
|
* SCSS lint fixPhil Hughes2016-06-081-1/+1
|
* Sends correct parameter to commit_author_link for avatarPhil Hughes2016-06-081-1/+1
|
* Improved spacing on mobilePhil Hughes2016-06-083-6/+16
|
* Updated failing testsPhil Hughes2016-06-084-10/+7
|
* Updated testsPhil Hughes2016-06-083-2/+9
|
* Updated some commit UI colorsPhil Hughes2016-06-084-20/+19
| | | | Fixed issue with tree view styles
* Updated commits UIPhil Hughes2016-06-087-96/+104
| | | | Closes #14633
* Merge branch '18080-project-header-alignment' into 'master' Jacob Schatz2016-06-082-5/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add flexbox to project header ## What does this MR do? Adds flexbox to project header to keep components vertically centered regardless of description presence/length ## What are the relevant issue numbers? Closes #18080 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_12.02.42_PM](/uploads/edd769110b52ec34046f4079619e45eb/Screen_Shot_2016-06-01_at_12.02.42_PM.png) ![Screen_Shot_2016-06-01_at_12.02.35_PM](/uploads/c5c2828ba5688a2588d3721a2d21d5fe/Screen_Shot_2016-06-01_at_12.02.35_PM.png) See merge request !4417
| * Add flexbox to project header18080-project-header-alignmentAnnabel Dunstone2016-06-012-5/+13
| |
* | Merge branch '18074-cancel-pipeline-text' into 'master' Jacob Schatz2016-06-081-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change color of canceled ci text to gray ## What does this MR do? Change text color of Canceled builds from `$gl-danger` to `$gl-gray` ## What are the relevant issue numbers? Closes #18074 ## Screenshots (if relevant) <img src="/uploads/f2ac59c5081c31cfb34bdc0470e31384/Screen_Shot_2016-06-01_at_10.38.17_AM.png" width="600px"> See merge request !4412
| * | Change color of canceled ci text to gray18074-cancel-pipeline-textAnnabel Dunstone2016-06-011-1/+4
| | |
* | | Merge branch 'bump-recaptcha-gem' into 'master' Robert Speicher2016-06-073-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump recaptcha gem to 3.0.0 to remove deprecated stoken support Google deprecated the use of stoken in its reCAPTCHA, so this gem is necessary to make things work again. Closes #18210 See merge request !4484
| * | | Bump recaptcha gem to 3.0.0 to remove deprecated stoken supportStan Hu2016-06-073-3/+4
| | | | | | | | | | | | | | | | Closes #18210
* | | | Merge branch 'optimise-email-css' into 'master' Robert Speicher2016-06-072-28/+167
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise email CSS for speed with Premailer Speed up emails-on-push by removing all descendant selectors from the CSS they use, which can make the CSS inlining much more efficient in certain cases. See: https://gitlab.com/gitlab-org/gitlab-ee/issues/490 See merge request !4511
| * | | | Optimise email CSS for speed with Premaileroptimise-email-cssSean McGivern2016-06-072-28/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all descendant selectors from the push email styling, to drastically reduce CPU time when inlining the CSS for syntax-highlighted diffs. Background: Premailer is a Ruby gem that inlines CSS styles from an external stylesheet before emails are sent, so that they are compatible with Gmail. At a high level, it parses the CSS files it finds, and parses the email body with Nokogiri. It then loops through the selectors in the CSS, using Nokogiri to find matching elements, and adds inline styles. (It does more than this, like merging styles applied to the same element, but that's not relevant to this issue.) Nokogiri converts CSS selectors to XPath first, like so: Nokogiri::CSS.xpath_for('foo bar') # => ["//foo//bar"] On documents with high node counts (say, a syntax-highlighted copy of jQuery), having both descendant selectors is very expensive. Both `//foo/bar` and `//bar` will be much more efficient, although neither are directly equivalent. An example, on a document containing two syntax-highlighted copies of jQuery: Benchmark.realtime { p doc.search('.o').count } # 9476 # => 0.3462457580026239 Benchmark.realtime { p doc.search('.code.white .o').count } # 9476 # => 85.51952634402551 The performance is similar for selectors which _don't_ match any elements, and as Premailer loops through all the available selectors, we want to avoid all descendant selectors in push emails. Because of the theming support in the web UI, all syntax highlighting selectors are descendant selectors of classes like `.code.white` or `.code.monokai`. There are over 60 CSS classes for syntax highlighting styles alone, all of which are expressed in the inefficient form above. In emails we always use the white theme, and were reusing the same CSS file. But in emails, we don't need to descend from `.code.white` as that will always be the theme, and we can also remove some other selectors that are only applicable to the web UI. For the remaining descendant selectors, we can convert them to child selectors, type selectors, or class selectors as appropriate. As in the example above, having no descendant selectors at all in the push email CSS can provide a drastic (and surprising) performance improvement.
* | | | | Merge branch 'upgrade-nokogiri' into 'master' Robert Speicher2016-06-073-3/+12
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump nokogiri to 1.6.8 Number of important security and bug fixes. See: https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06 See merge request !4500
| * | | | Add LGPLv2 to license whiltelistStan Hu2016-06-071-0/+6
| | | | |
| * | | | Bump nokogiri to 1.6.8Stan Hu2016-06-072-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Number of important security and bug fixes. See: https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06
* | | | | Merge branch 'load-knapsack-if-defined' into 'master' Stan Hu2016-06-072-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load knapsack in Rakefile only when is bundled Fixes `production` builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/builds/85407 cc @marin See merge request !4514
| * | | | | Load knapsack in Rakefile only when is bundledload-knapsack-if-definedKamil Trzcinski2016-06-072-3/+2
| |/ / / /
* | | | | Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-076-12/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications dropdown on project page now has descriptions ## What does this MR do? Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense. ## What are the relevant issue numbers? Part of #12758 ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png) See merge request !4374
| * | | | | Updated colorsnotification-dropdown-labelsPhil Hughes2016-06-071-0/+2
| | | | | |
| * | | | | Fixed failing testsPhil Hughes2016-06-072-2/+2
| | | | | |
| * | | | | CHANGELOG itemPhil Hughes2016-06-071-0/+1
| | | | | |
| * | | | | Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-074-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | This is part of #12758
* | | | | | Merge branch 'add-license-finder-to-contributing' into 'master' Stan Hu2016-06-071-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add License Finder information to contribution acceptance criteria. To make it clear what should be done when the license finder test fails. cc: @stanhu See merge request !4512
| * | | | | | Add License Finder information to contribution acceptance criteria.Connor Shea2016-06-071-0/+2
| | | | | | |
* | | | | | | Merge branch '18058-sub-nav' into 'master' Jacob Schatz2016-06-0715-266/+345
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sub navigation ## What does this MR do? Styles sub nav cc @dzaporozhets @skyruler @jschatz1 ## What are the relevant issue numbers? #18058 and #17983 ## Screenshots (if relevant) ![Screen_Shot_2016-06-03_at_12.10.26_PM](/uploads/8b948c32699a93ab0a390bda31e0e411/Screen_Shot_2016-06-03_at_12.10.26_PM.png) ![Screen_Shot_2016-06-03_at_12.10.34_PM](/uploads/241115c35d0618f3de739be9a670416d/Screen_Shot_2016-06-03_at_12.10.34_PM.png) See merge request !4468
| * | | | | | Fix alignment of wiki top areaAnnabel Dunstone2016-06-072-1/+5
| | | | | | |
| * | | | | | Align links and tabs18058-sub-navAnnabel Dunstone2016-06-071-3/+6
| | | | | | |
| * | | | | | Add scrolling tabs to code subnavAnnabel Dunstone2016-06-072-20/+41
| | | | | | |
| * | | | | | Finish styling sub navAnnabel Dunstone2016-06-0711-211/+234
| | | | | | |
| * | | | | | Start styling sub navAnnabel Dunstone2016-06-074-52/+80
| |/ / / / /
* | | | | | Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz2016-06-078-163/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement compact side nav ## What does this MR do? Implements new compact nav design Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268) ## What are the relevant issue numbers? Closes #18013 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png) ![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png) cc @dzaporozhets See merge request !4447
| * | | | | | Update charcoal theme colors18013-compact-sidebarAnnabel Dunstone2016-06-071-2/+5
| | | | | | |
| * | | | | | Update nav link font size and spacing; fix hamburger iconAnnabel Dunstone2016-06-073-24/+17
| | | | | | |
| * | | | | | Fix control btn positionAnnabel Dunstone2016-06-071-1/+1
| | | | | | |
| * | | | | | Remove todos count tests in navAnnabel Dunstone2016-06-071-2/+0
| | | | | | |
| * | | | | | Test impersonation using img data attribute instead of usernameAnnabel Dunstone2016-06-072-5/+5
| | | | | | |
| * | | | | | Implement compact side navAnnabel Dunstone2016-06-075-143/+47
| |/ / / / /
* | | | | | Merge branch ↵Yorick Peterse2016-06-072-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18082-instrument-repositorycheck-singlerepositoryworker-manually' into 'master' Instrument `RepositoryCheck::SingleRepositoryWorker` manually See merge request !4446
| * | | | | | Instrument `RepositoryCheck::SingleRepositoryWorker` manuallyAlejandro Rodríguez2016-06-072-0/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware.
* | | | | | Merge branch 'refactor/ci-config-add-facade' into 'master' Rémy Coutable2016-06-075-7/+141
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new GitLab CI configuration facade class ## What does this MR do? This MR is a first iteration of major CI configuration refactoring. See #17139 and #15060 for more details. ## What are the relevant issue numbers? Closes #17139 See merge request !4462
| * | | | | Improve Ci config loader by changing method signaturerefactor/ci-config-add-facadeGrzegorz Bizon2016-06-073-6/+6
| | | | | |
| * | | | | Remove duplicated exception in Ci configGrzegorz Bizon2016-06-073-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary refactoring stub, that is planned to be removed after removing legacy config processor.