| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixed potential issue with 2 ci status polling events happeningfix-multiple-ci-status-poll | Phil Hughes | 2016-05-26 | 2 | -2/+16 |
| | | |||||
| * | Merge branch 'sidebar-expand-collapse' into 'master' | Jacob Schatz | 2016-05-26 | 4 | -33/+117 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix right sidebar expand/collapse issue Fixed branch name of the !4117 ------------------ Fixes #15643 - Fixed a typo in `toggleSidebar` method of `Sidebar` class. - Fixed a minor styling issue to fix the sidebar to the top of the page. - Added tests for Sidebar. ## Before  ## After  See merge request !4292 | ||||
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵sidebar-expand-collapse | Fatih Acet | 2016-05-26 | 69 | -443/+883 |
| | |\ | |/ |/| | | | sidebar-expand-collapse | ||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-05-26 | 70 | -445/+874 |
| |\ \ | |||||
| | * \ | Merge branch 'updated-contrib-calendar' into 'master' | Jacob Schatz | 2016-05-25 | 13 | -131/+256 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?  cc. @jschatz1 See merge request !3944 | ||||
| | | * | | Moved into class methodsupdated-contrib-calendar | Phil Hughes | 2016-05-16 | 1 | -90/+105 |
| | | | | | |||||
| | | * | | Updated spacing of the calendar | Phil Hughes | 2016-05-16 | 1 | -0/+3 |
| | | | | | |||||
| | | * | | Fixed issue with selected date not loading correctly | Phil Hughes | 2016-05-16 | 3 | -53/+49 |
| | | | | | | | | | | | | | | | | | Added loading icon to selected date box | ||||
| | | * | | Formats tooltip title & date correctly | Phil Hughes | 2016-05-16 | 1 | -11/+25 |
| | | | | | | | | | | | | | | | | | Correctly changes the activity when clicking a date - will also revert back to old data when clicking date again | ||||
| | | * | | tests update | Phil Hughes | 2016-05-16 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Removed cal heatmap from gemfile | Phil Hughes | 2016-05-16 | 2 | -5/+0 |
| | | | | | |||||
| | | * | | Group the contributing calendar by day | Phil Hughes | 2016-05-16 | 9 | -120/+132 |
| | | | | | | | | | | | | | | | | | This aligns the boxes correctly with the day on the left side of the calendar | ||||
| | | * | | Updated contrib map away from cal heat map | Phil Hughes | 2016-05-16 | 3 | -24/+114 |
| | | | | | |||||
| | * | | | Merge branch '17339-mobile-navigation' into 'master' | Jacob Schatz | 2016-05-25 | 9 | -155/+233 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobile navigation fade out Closes #17339 Closes #17610 <img src="/uploads/e382dd363bf8beb28339fa6b152be092/Screen_Shot_2016-05-18_at_10.16.59_AM.png" width="400px"> See merge request !4195 | ||||
| | | * | | | Change to xs breakpoint, layout_nav updates | Annabel Dunstone | 2016-05-25 | 2 | -11/+11 |
| | | | | | | |||||
| | | * | | | Add fade out to sub nav | Annabel Dunstone | 2016-05-25 | 6 | -22/+46 |
| | | | | | | |||||
| | | * | | | Add fade to project nav; fix bug with controls | Annabel Dunstone | 2016-05-25 | 2 | -103/+113 |
| | | | | | | |||||
| | | * | | | Refactor nav links css | Annabel Dunstone | 2016-05-25 | 1 | -15/+8 |
| | | | | | | |||||
| | | * | | | Add fade out to left side of layout nav; remove dropdown nav helper; remove ↵ | Annabel Dunstone | 2016-05-25 | 6 | -44/+38 |
| | | | | | | | | | | | | | | | | | | | | | controls button from mobile | ||||
| | | * | | | Fix coffeescript; remove fade out div so area is clickable; remove scrollbar ↵ | Annabel Dunstone | 2016-05-25 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | on chrome | ||||
| | | * | | | Move fade out div | Annabel Dunstone | 2016-05-25 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Check screen width before increasing max position | Annabel Dunstone | 2016-05-25 | 1 | -4/+2 |
| | | | | | | |||||
| | | * | | | Remove arrows from mobile scroll fade out | Annabel Dunstone | 2016-05-25 | 6 | -68/+74 |
| | | | | | | |||||
| | | * | | | Start scrolling tabs design | Annabel Dunstone | 2016-05-25 | 3 | -1/+50 |
| | | | | | | |||||
| | * | | | | Merge branch 'upgrade-state_machines-activerecord' into 'master' | Robert Speicher | 2016-05-25 | 2 | -6/+6 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Update state_machines-activerecord from 0.3.0 to 0.4.0. Includes support for Rails 5, working towards #14286. See merge request !4295 | ||||
| | | * | | | Update state_machines-activerecord from 0.3.0 to 0.4.0. | Connor Shea | 2016-05-25 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master Includes Rails 5 support. | ||||
| | * | | | | Merge branch 'add_ha_diagrams' into 'master' | Achilleas Pipinellis | 2016-05-25 | 3 | -0/+4 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new HA diagrams [ci skip] ## What does this MR do? Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!) See merge request !4289 | ||||
| | | * | | | Add new HA diagrams [ci skip] | Drew Blessing | 2016-05-25 | 3 | -0/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'rs-fix-rubocop' into 'master' | Robert Speicher | 2016-05-25 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix RuboCop See merge request !4294 | ||||
| | | * | | | | Fix RuboCop | Robert Speicher | 2016-05-25 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'rs-confirmation-mail' into 'master' | Robert Speicher | 2016-05-25 | 13 | -11/+210 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | New confirmation email See merge request !3354 | ||||
| | | * | | | | Add CHANGELOG entry for redesigned confirmation emails | Robert Speicher | 2016-05-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | | * | | | | Don't remove IDs via premailer | Robert Speicher | 2016-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to debug style rules. | ||||
| | | * | | | | New confirmation email :fire: | Robert Speicher | 2016-05-25 | 8 | -2/+188 |
| | | | | | | | |||||
| | | * | | | | Make the standard Devise confirmation email our new plaintext version | Robert Speicher | 2016-05-25 | 2 | -9/+9 |
| | | | | | | | |||||
| | | * | | | | Customize ActionMailer preview path | Robert Speicher | 2016-05-25 | 2 | -0/+12 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'rs-remove-issue_to_atom' into 'master' | Douwe Maan | 2016-05-25 | 5 | -28/+17 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `issue_to_atom` helper See merge request !4265 | ||||
| | | * | | | | Remove `issue_to_atom` helperrs-remove-issue_to_atom | Robert Speicher | 2016-05-23 | 5 | -28/+17 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'improve-pipeline-design' into 'master' | Douwe Maan | 2016-05-25 | 12 | -56/+45 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve design of Pipeline view ## What does this MR do? Improves current design of Pipelines view when there is multiple stages. This makes the statuses clickable and makes the view more compact. ## Screenshots (if relevant)  cc @DouweM @markpundsack @rspeicher @marin See merge request !4230 | ||||
| | | * | | | | | Remove top block from builds pageimprove-pipeline-design | Annabel Dunstone | 2016-05-24 | 3 | -5/+0 |
| | | | | | | | | |||||
| | | * | | | | | Remove icons from tables; remove timestamp from pipelines, remove info block ↵ | Annabel Dunstone | 2016-05-24 | 7 | -32/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at top of pipelines | ||||
| | | * | | | | | Increase max-width of stage cells | Annabel Dunstone | 2016-05-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' into improve-pipeline-design | Kamil Trzcinski | 2016-05-23 | 97 | -546/+1502 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Improve status rendering | Kamil Trzcinski | 2016-05-21 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Improve design of Pipeline view | Kamil Trzcinski | 2016-05-21 | 5 | -21/+44 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'rs-event-atom-partial' into 'master' | Douwe Maan | 2016-05-25 | 8 | -48/+39 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `event_to_atom` helper See merge request !4234 | ||||
| | | * | | | | | | | Render a collection for the Commits atom feedrs-event-atom-partial | Robert Speicher | 2016-05-23 | 2 | -14/+15 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Remove `event_to_atom` helper | Robert Speicher | 2016-05-23 | 6 | -34/+24 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'fix/import-url-uri-issue' into 'master' | Douwe Maan | 2016-05-25 | 2 | -1/+4 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for import URL URI problem when URL contains a space Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17559 Prevents an already encoded URL to be encoded again - preventing %20 => %25%20 See merge request !4180 | ||||
| | | * | | | | | | | | fix changelog and mergefix/import-url-uri-issue | James Lopez | 2016-05-23 | 2 | -2/+4 |
| | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |