summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed role from linkissue-edit-inline-locked-warningPhil Hughes2017-05-221-2/+1
* Merge branch 'issue-edit-inline' into issue-edit-inline-locked-warningPhil Hughes2017-05-2214-24/+445
|\
| * Merge branch 'issue-edit-inline-move-project' into 'issue-edit-inline'Filipa Lacerda2017-05-1911-18/+229
| |\
| | * Removed un-used CSSissue-edit-inline-move-projectPhil Hughes2017-05-183-5/+14
| | * Added back a removed testPhil Hughes2017-05-181-1/+17
| | * Merge branch 'issue-edit-inline' into issue-edit-inline-move-projectPhil Hughes2017-05-1811-10/+142
| | |\
| | * | Added move to project in issue inline edit formPhil Hughes2017-05-1711-8/+215
| * | | Merge branch 'issue-edit-inline-description-field-specs' into 'issue-edit-inl...Filipa Lacerda2017-05-183-6/+216
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'issue-edit-inline' into issue-edit-inline-description-field-specsissue-edit-inline-description-field-specsPhil Hughes2017-05-1811-11/+140
| | |\ \ | | |/ / | |/| |
| | * | Added a test with markdownPhil Hughes2017-05-171-1/+13
| | * | Merge branch 'issue-edit-inline' into issue-edit-inline-description-field-specsPhil Hughes2017-05-1683-353/+945
| | |\ \ | | | |/
| | * | Added specs for description fieldPhil Hughes2017-05-153-0/+222
* | | | Added specs for testing when warning is visiblePhil Hughes2017-05-184-17/+77
* | | | Show warning if realtime data has changed since the form has openedPhil Hughes2017-05-184-3/+50
|/ / /
* | | Merge branch 'auto-focus-description-field' into 'issue-edit-inline'Filipa Lacerda2017-05-182-1/+38
|\ \ \
| * | | Fixed typoauto-focus-description-fieldPhil Hughes2017-05-181-1/+1
| * | | Focus the description field in the inline form when mountedPhil Hughes2017-05-172-1/+38
| | |/ | |/|
* | | Merge branch 'issue-edit-inline-stop-edit-button-reseting-state' into 'issue-...Filipa Lacerda2017-05-172-8/+27
|\ \ \
| * | | Stops formState from updating if the form is already openissue-edit-inline-stop-edit-button-reseting-statePhil Hughes2017-05-172-8/+27
|/ / /
* | | Merge branch 'issue-edit-inline-confidential' into 'issue-edit-inline' Filipa Lacerda2017-05-177-1/+68
|\ \ \
| * \ \ Merge branch 'issue-edit-inline' into issue-edit-inline-confidentialissue-edit-inline-confidentialPhil Hughes2017-05-1713-6/+398
| |\ \ \ | | |/ /
| * | | Use dash instead of underscorePhil Hughes2017-05-161-2/+2
| * | | Added spec for window reloadPhil Hughes2017-05-161-12/+23
| * | | Merge branch 'issue-edit-inline' into issue-edit-inline-confidentialPhil Hughes2017-05-1674-264/+854
| |\ \ \
| * | | | Added inline confidential fieldPhil Hughes2017-05-156-1/+46
* | | | | Merge branch 'issue-edit-inline-title-validation' into 'issue-edit-inline' Filipa Lacerda2017-05-173-2/+32
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Disable inline submit button when title is blankissue-edit-inline-title-validationPhil Hughes2017-05-163-2/+32
| | |/ / | |/| |
* | | | Merge branch 'issue-edit-inline-description-field' into 'issue-edit-inline' Filipa Lacerda2017-05-1614-18/+398
|\ \ \ \ | |/ / / |/| | |
| * | | Use the tooltip mixinissue-edit-inline-description-fieldPhil Hughes2017-05-164-8/+30
| * | | Fixed else-if in descriptionPhil Hughes2017-05-161-1/+1
| * | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-fieldPhil Hughes2017-05-1679-345/+915
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-1671-212/+793
|\ \ \
| * \ \ Merge branch '29421-production-config-assets-compile-false' into 'master' Stan Hu2017-05-161-1/+1
| |\ \ \
| | * | | Set 'config.assets.compile = false' in production29421-production-config-assets-compile-falseJames Edwards-Jones2017-03-141-1/+1
| * | | | Merge branch 'dm-rename-column-concurrently-with-null' into 'master' Yorick Peterse2017-05-152-3/+6
| |\ \ \ \
| | * | | | Disallow NULL on renamed column after default has been setDouwe Maan2017-05-152-3/+6
| * | | | | Merge branch 'omega-submodules' into 'master'Robert Speicher2017-05-153-0/+21
| |\ \ \ \ \
| | * | | | | submodule_links: Handle in-repository submodule urlsDavid Turner2017-05-153-0/+21
| * | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' Annabel Dunstone Gray2017-05-156-25/+52
| |\ \ \ \ \ \
| | * | | | | | Scope recent searches to projectEric Eastwood2017-05-156-25/+52
| * | | | | | | Merge branch 'revert-0663458c' into 'master' Douwe Maan2017-05-1525-125/+121
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-1525-125/+121
| |/ / / / / / /
| * | | | | | | Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrateAlejandro Rodríguez2017-05-111-3/+3
| * | | | | | | | Merge branch '31106-tabs-alignment' into 'master' Annabel Dunstone Gray2017-05-157-55/+82
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | fix Resolved Discussions counter wrapping to next lineSimon Knox2017-05-137-55/+82
| * | | | | | | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-157-11/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-137-11/+11
| * | | | | | | | | Merge branch 'bvl-fix-static-analysis-failure-in-users-finder' into 'master' Rémy Coutable2017-05-151-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix trailing ',' in hash.Bob Van Landuyt2017-05-151-1/+1
| |/ / / / / / / / /