summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...feature/runner-lock-on-projectLin Jen-Shin2016-06-2010-14/+92
|\
| * Merge branch 'patch-1' into 'master' Stan Hu2016-06-201-1/+1
| |\
| | * Broken instructions. git fetch --all --tags doesn't refresh tagsfliespl2016-05-091-1/+1
| * | Merge branch 'issue_12758_2' into 'master' Yorick Peterse2016-06-201-1/+2
| |\ \
| | * | Add notification_settings:events to schemaissue_12758_2Felipe Artur2016-06-201-1/+2
| * | | Merge branch 'mr-button-placement' into 'master' Jacob Schatz2016-06-202-2/+15
| |\ \ \
| | * | | Fixed mobile stylingmr-button-placementPhil Hughes2016-06-201-0/+13
| | * | | Fixed placement of close button on merge requestsPhil Hughes2016-06-181-2/+2
| * | | | Merge branch 'fix-double-query-string-url' into 'master' Robert Speicher2016-06-202-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | using request dot path insteadbarthc2016-06-172-2/+2
| | * | | Merge branch 'master' into fix-double-query-string-urlbarthc2016-06-171181-6858/+36154
| | |\ \ \
| | * | | | fix double query string in urlBartholomew2016-06-061-1/+1
| * | | | | Merge branch 'pinned-nav-cookie-path' into 'master' Jacob Schatz2016-06-201-3/+3
| |\ \ \ \ \
| | * | | | | Set path for pinned nav cookiepinned-nav-cookie-pathPhil Hughes2016-06-201-3/+3
| * | | | | | Merge branch 'document-environments' into 'master' Achilleas Pipinellis2016-06-203-6/+70
| |\ \ \ \ \ \
| | * | | | | | Turn note into normal textdocument-environmentsMark Pundsack2016-06-161-1/+0
| | * | | | | | Document environments and deploymentsMark Pundsack2016-06-162-0/+60
| | * | | | | | Tweak grammarMark Pundsack2016-06-161-6/+11
* | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-20223-825/+11032
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '18697-uniqueness-key-validation' into 'master' Yorick Peterse2016-06-207-3/+58
| |\ \ \ \ \ \ \
| | * | | | | | | Remove Duplicated keys add UNIQUE index to fingerprint18697-uniqueness-key-validationPaco Guzman2016-06-207-3/+58
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch '18810-nameerror-uninitialized-constant-mail-parsers-addressstru...Robert Speicher2016-06-201-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid autoload issue such as 'Mail::Parsers::AddressStruct'18810-nameerror-uninitialized-constant-mail-parsers-addressstructRémy Coutable2016-06-201-0/+4
| * | | | | | | | Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-202-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-172-1/+2
| * | | | | | | | | Merge branch 'dz-admin-tabs-dropdown' into 'master' Jacob Schatz2016-06-204-55/+68
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Put some admin settings in dropdowndz-admin-tabs-dropdownDmitriy Zaporozhets2016-06-205-71/+75
| | * | | | | | | | | Move appearance settings as sub tab to application settingsdz-admin-tabsDmitriy Zaporozhets2016-06-204-14/+23
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'grammar-tweaks' into 'master' Achilleas Pipinellis2016-06-201-23/+25
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Grammar and typographic changes to artifacts documentationgrammar-tweaksMark Pundsack2016-06-171-17/+19
| | * | | | | | | | | Tweak grammarMark Pundsack2016-06-171-6/+6
| * | | | | | | | | | Merge branch 'source_omnibus_doc_styleguide' into 'master' Achilleas Pipinellis2016-06-201-0/+56
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add styleguide on configuration settings documentationAchilleas Pipinellis2016-06-201-0/+56
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'fix/import-export-prod' into 'master' Rémy Coutable2016-06-202-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | use rails root joinJames Lopez2016-06-201-1/+1
| | * | | | | | | | fixed a couple of errors spotted in productionJames Lopez2016-06-202-2/+2
| |/ / / / / / / /
| * | | | | | | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-188-2/+32
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-188-2/+32
| | |/ / / / / /
| * | | | | | | Merge branch 'star-fork-mobile' into 'master' Jacob Schatz2016-06-183-1/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Display Star and Fork on mobile, fix #18537.star-fork-mobileConnor Shea2016-06-163-1/+15
| * | | | | | | | Merge branch 'milestones-show-mrs' into 'master' Jacob Schatz2016-06-182-0/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add merge request data to the progress information on Milestones pages.milestones-show-mrsConnor Shea2016-06-162-0/+8
| * | | | | | | | | Merge branch '18762-feedback-btn' into 'master' Jacob Schatz2016-06-181-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix margin & padding on activity btn18762-feedback-btnAnnabel Dunstone2016-06-171-1/+2
| * | | | | | | | | | Merge branch 'comment-form-button-spacing' into 'master' Jacob Schatz2016-06-183-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed alignment of buttons in note formscomment-form-button-spacingPhil Hughes2016-06-173-4/+4
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'dz-organize-admin-settings' into 'master' Jacob Schatz2016-06-183-64/+70
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Move admin->runners tab as subnav of overview tabdz-organize-admin-settingsDmitriy Zaporozhets2016-06-163-64/+70
| * | | | | | | | | | | Merge branch 'tags-edit-tooltip-placement' into 'master' Jacob Schatz2016-06-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed tooltip placement on edit tags buttontags-edit-tooltip-placementPhil Hughes2016-06-171-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |