summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure project name is present on pagefix-shortcuts-specAlfredo Sumaran2016-05-261-2/+2
* Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-263-0/+56
|\
| * Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-263-5/+5
| * Test ProxyFlightTime middlewareJacob Vosmaer2016-05-251-0/+31
| * Align class name with field nameJacob Vosmaer2016-05-252-2/+2
| * Send data to InfluxDB instead of stdoutJacob Vosmaer2016-05-251-4/+6
| * Couple ProxyTiming to Metrics middlewareJacob Vosmaer2016-05-252-1/+1
| * Measure proxy timing: needs influxdb codeJacob Vosmaer2016-05-242-0/+23
* | Merge branch 'services-ui' into 'master' Jacob Schatz2016-05-262-39/+45
|\ \
| * | Hide description on mobileservices-uiPhil Hughes2016-05-261-25/+24
| * | Updated services UIPhil Hughes2016-05-172-39/+46
* | | Merge branch 'remove-main-language' into 'master' Josh Frye2016-05-268-83/+23
|\ \ \
| * | | Update changelogJosh Frye2016-05-261-0/+1
| * | | Remove main_language and testsremove-main-languageJosh Frye2016-05-258-84/+23
* | | | Merge branch 'discussion-outdated-form' into 'master' Jacob Schatz2016-05-261-1/+1
|\ \ \ \
| * | | | Fixed JS error when trying to remove discussion formPhil Hughes2016-05-261-1/+1
* | | | | Merge branch 'link-to-in-issues-index' into 'master' Jacob Schatz2016-05-262-2/+2
|\ \ \ \ \
| * | | | | Replace `link_to_gfm` with `link_to` in merge request and issue titles.link-to-in-issues-indexConnor Shea2016-05-242-2/+2
* | | | | | Merge branch 'sidebar-expand-collapse' into 'master' Jacob Schatz2016-05-264-33/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-...sidebar-expand-collapseFatih Acet2016-05-2669-443/+883
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-2670-445/+874
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-2513-131/+256
| |\ \ \ \ \ \
| | * | | | | | Moved into class methodsupdated-contrib-calendarPhil Hughes2016-05-161-90/+105
| | * | | | | | Updated spacing of the calendarPhil Hughes2016-05-161-0/+3
| | * | | | | | Fixed issue with selected date not loading correctlyPhil Hughes2016-05-163-53/+49
| | * | | | | | Formats tooltip title & date correctlyPhil Hughes2016-05-161-11/+25
| | * | | | | | tests updatePhil Hughes2016-05-161-1/+1
| | * | | | | | Removed cal heatmap from gemfilePhil Hughes2016-05-162-5/+0
| | * | | | | | Group the contributing calendar by dayPhil Hughes2016-05-169-120/+132
| | * | | | | | Updated contrib map away from cal heat mapPhil Hughes2016-05-163-24/+114
| * | | | | | | Merge branch '17339-mobile-navigation' into 'master' Jacob Schatz2016-05-259-155/+233
| |\ \ \ \ \ \ \
| | * | | | | | | Change to xs breakpoint, layout_nav updatesAnnabel Dunstone2016-05-252-11/+11
| | * | | | | | | Add fade out to sub navAnnabel Dunstone2016-05-256-22/+46
| | * | | | | | | Add fade to project nav; fix bug with controlsAnnabel Dunstone2016-05-252-103/+113
| | * | | | | | | Refactor nav links cssAnnabel Dunstone2016-05-251-15/+8
| | * | | | | | | Add fade out to left side of layout nav; remove dropdown nav helper; remove c...Annabel Dunstone2016-05-256-44/+38
| | * | | | | | | Fix coffeescript; remove fade out div so area is clickable; remove scrollbar ...Annabel Dunstone2016-05-252-2/+6
| | * | | | | | | Move fade out divAnnabel Dunstone2016-05-251-2/+2
| | * | | | | | | Check screen width before increasing max positionAnnabel Dunstone2016-05-251-4/+2
| | * | | | | | | Remove arrows from mobile scroll fade outAnnabel Dunstone2016-05-256-68/+74
| | * | | | | | | Start scrolling tabs designAnnabel Dunstone2016-05-253-1/+50
| * | | | | | | | Merge branch 'upgrade-state_machines-activerecord' into 'master' Robert Speicher2016-05-252-6/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Update state_machines-activerecord from 0.3.0 to 0.4.0.Connor Shea2016-05-252-6/+6
| * | | | | | | | Merge branch 'add_ha_diagrams' into 'master' Achilleas Pipinellis2016-05-253-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add new HA diagrams [ci skip]Drew Blessing2016-05-253-0/+4
| * | | | | | | | Merge branch 'rs-fix-rubocop' into 'master' Robert Speicher2016-05-251-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix RuboCopRobert Speicher2016-05-251-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge branch 'rs-confirmation-mail' into 'master' Robert Speicher2016-05-2513-11/+210
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add CHANGELOG entry for redesigned confirmation emailsRobert Speicher2016-05-251-0/+1
| | * | | | | | | | Don't remove IDs via premailerRobert Speicher2016-05-251-1/+1