summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | New confirmation email :fire:Robert Speicher2016-05-258-2/+188
| * | Make the standard Devise confirmation email our new plaintext versionRobert Speicher2016-05-252-9/+9
| * | Customize ActionMailer preview pathRobert Speicher2016-05-252-0/+12
|/ /
* | Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan2016-05-255-28/+17
|\ \
| * | Remove `issue_to_atom` helperrs-remove-issue_to_atomRobert Speicher2016-05-235-28/+17
* | | Merge branch 'improve-pipeline-design' into 'master' Douwe Maan2016-05-2512-56/+45
|\ \ \
| * | | Remove top block from builds pageimprove-pipeline-designAnnabel Dunstone2016-05-243-5/+0
| * | | Remove icons from tables; remove timestamp from pipelines, remove info block ...Annabel Dunstone2016-05-247-32/+3
| * | | Increase max-width of stage cellsAnnabel Dunstone2016-05-241-1/+1
| * | | Merge branch 'master' into improve-pipeline-designKamil Trzcinski2016-05-2397-546/+1502
| |\ \ \
| * | | | Improve status renderingKamil Trzcinski2016-05-211-2/+2
| * | | | Improve design of Pipeline viewKamil Trzcinski2016-05-215-21/+44
* | | | | Merge branch 'rs-event-atom-partial' into 'master' Douwe Maan2016-05-258-48/+39
|\ \ \ \ \
| * | | | | Render a collection for the Commits atom feedrs-event-atom-partialRobert Speicher2016-05-232-14/+15
| * | | | | Remove `event_to_atom` helperRobert Speicher2016-05-236-34/+24
* | | | | | Merge branch 'fix/import-url-uri-issue' into 'master' Douwe Maan2016-05-252-1/+4
|\ \ \ \ \ \
| * | | | | | fix changelog and mergefix/import-url-uri-issueJames Lopez2016-05-232-2/+4
| * | | | | | fix merge conflictsJames Lopez2016-05-23458-929/+8922
| |\ \ \ \ \ \
| * | | | | | | avoid encoding import url and delegate good format to userJames Lopez2016-05-232-17/+1
| * | | | | | | added CHANGELOGJames Lopez2016-05-171-0/+1
| * | | | | | | fix for import URL URI problem when URL contains a spaceJames Lopez2016-05-172-5/+22
* | | | | | | | Merge branch 'issue_10725' into 'master' Douwe Maan2016-05-254-1/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix forks creation when visibility level is restrictedissue_10725Felipe Artur2016-05-254-1/+48
* | | | | | | | | Merge branch 'zero-project-creation-error-message' into 'master' Robert Speicher2016-05-252-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed project model testszero-project-creation-error-messagePhil Hughes2016-05-252-3/+3
| * | | | | | | | | Updated erorr message when project limit is zeroPhil Hughes2016-05-241-1/+7
* | | | | | | | | | Merge branch 'closed-by-alignment' into 'master' Jacob Schatz2016-05-252-6/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Related merge request text alignmentclosed-by-alignmentPhil Hughes2016-05-232-6/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'github/master' into 'master'Robert Speicher2016-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #10338 from donhui/patch-1Robert Speicher2016-05-251-1/+1
| |\ \ \ \ \ \ \ \ \ \