Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed role from linkissue-edit-inline-locked-warning | Phil Hughes | 2017-05-22 | 1 | -2/+1 |
| | | | | [ci skip] | ||||
* | Merge branch 'issue-edit-inline' into issue-edit-inline-locked-warning | Phil Hughes | 2017-05-22 | 14 | -24/+445 |
|\ | | | | | | | [ci skip] | ||||
| * | Merge branch 'issue-edit-inline-move-project' into 'issue-edit-inline' | Filipa Lacerda | 2017-05-19 | 11 | -18/+229 |
| |\ | | | | | | | | | | | | | Added move to project in issue inline edit form See merge request !11437 | ||||
| | * | Removed un-used CSSissue-edit-inline-move-project | Phil Hughes | 2017-05-18 | 3 | -5/+14 |
| | | | | | | | | | | | | | | | | | | Fixed random if statement [ci skip] | ||||
| | * | Added back a removed test | Phil Hughes | 2017-05-18 | 1 | -1/+17 |
| | | | | | | | | | | | | [ci skip] | ||||
| | * | Merge branch 'issue-edit-inline' into issue-edit-inline-move-project | Phil Hughes | 2017-05-18 | 11 | -10/+142 |
| | |\ | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Added move to project in issue inline edit form | Phil Hughes | 2017-05-17 | 11 | -8/+215 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'issue-edit-inline-description-field-specs' into ↵ | Filipa Lacerda | 2017-05-18 | 3 | -6/+216 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | 'issue-edit-inline' Issue edit inline description field specs See merge request !11376 | ||||
| | * | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-field-specsissue-edit-inline-description-field-specs | Phil Hughes | 2017-05-18 | 11 | -11/+140 |
| | |\ \ | | |/ / | |/| | | | | | | [ci skip] | ||||
| | * | | Added a test with markdown | Phil Hughes | 2017-05-17 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-field-specs | Phil Hughes | 2017-05-16 | 83 | -353/+945 |
| | |\ \ | | | |/ | | | | | | | | | [ci skip] | ||||
| | * | | Added specs for description field | Phil Hughes | 2017-05-15 | 3 | -0/+222 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Added specs for testing when warning is visible | Phil Hughes | 2017-05-18 | 4 | -17/+77 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Show warning if realtime data has changed since the form has opened | Phil Hughes | 2017-05-18 | 4 | -3/+50 |
|/ / / | |||||
* | | | Merge branch 'auto-focus-description-field' into 'issue-edit-inline' | Filipa Lacerda | 2017-05-18 | 2 | -1/+38 |
|\ \ \ | | | | | | | | | | | | | | | | | Focus the description field in the inline form when mounted See merge request !11441 | ||||
| * | | | Fixed typoauto-focus-description-field | Phil Hughes | 2017-05-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Focus the description field in the inline form when mounted | Phil Hughes | 2017-05-17 | 2 | -1/+38 |
| | |/ | |/| | | | | | | | [ci skip] | ||||
* | | | Merge branch 'issue-edit-inline-stop-edit-button-reseting-state' into ↵ | Filipa Lacerda | 2017-05-17 | 2 | -8/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'issue-edit-inline' Stops formState from updating if the form is already open See merge request !11443 | ||||
| * | | | Stops formState from updating if the form is already openissue-edit-inline-stop-edit-button-reseting-state | Phil Hughes | 2017-05-17 | 2 | -8/+27 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Merge branch 'issue-edit-inline-confidential' into 'issue-edit-inline' | Filipa Lacerda | 2017-05-17 | 7 | -1/+68 |
|\ \ \ | | | | | | | | | | | | | | | | | Issue edit inline confidential See merge request !11389 | ||||
| * \ \ | Merge branch 'issue-edit-inline' into issue-edit-inline-confidentialissue-edit-inline-confidential | Phil Hughes | 2017-05-17 | 13 | -6/+398 |
| |\ \ \ | | |/ / | | | | | | | | | [ci skip] | ||||
| * | | | Use dash instead of underscore | Phil Hughes | 2017-05-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Added spec for window reload | Phil Hughes | 2017-05-16 | 1 | -12/+23 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'issue-edit-inline' into issue-edit-inline-confidential | Phil Hughes | 2017-05-16 | 74 | -264/+854 |
| |\ \ \ | |||||
| * | | | | Added inline confidential field | Phil Hughes | 2017-05-15 | 6 | -1/+46 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge branch 'issue-edit-inline-title-validation' into 'issue-edit-inline' | Filipa Lacerda | 2017-05-17 | 3 | -2/+32 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Disable inline submit button when title is blank See merge request !11409 | ||||
| * | | | | Disable inline submit button when title is blankissue-edit-inline-title-validation | Phil Hughes | 2017-05-16 | 3 | -2/+32 |
| | |/ / | |/| | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'issue-edit-inline-description-field' into 'issue-edit-inline' | Filipa Lacerda | 2017-05-16 | 14 | -18/+398 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Issue edit inline description field See merge request !11336 | ||||
| * | | | Use the tooltip mixinissue-edit-inline-description-field | Phil Hughes | 2017-05-16 | 4 | -8/+30 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Fixed else-if in description | Phil Hughes | 2017-05-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-field | Phil Hughes | 2017-05-16 | 79 | -345/+915 |
| |\ \ \ | |/ / / |/| | / | | |/ | |/| | [ci skip] | ||||
* | | | Merge branch 'master' into issue-edit-inline | Phil Hughes | 2017-05-16 | 71 | -212/+793 |
|\ \ \ | |||||
| * \ \ | Merge branch '29421-production-config-assets-compile-false' into 'master' | Stan Hu | 2017-05-16 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set 'config.assets.compile = false' in production Closes #29421 See merge request !9917 | ||||
| | * | | | Set 'config.assets.compile = false' in production29421-production-config-assets-compile-false | James Edwards-Jones | 2017-03-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dm-rename-column-concurrently-with-null' into 'master' | Yorick Peterse | 2017-05-15 | 2 | -3/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Disallow NULL on renamed column after default has been set See merge request !11396 | ||||
| | * | | | | Disallow NULL on renamed column after default has been set | Douwe Maan | 2017-05-15 | 2 | -3/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'omega-submodules' into 'master' | Robert Speicher | 2017-05-15 | 3 | -0/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omega submodules See merge request !10797 | ||||
| | * | | | | | submodule_links: Handle in-repository submodule urls | David Turner | 2017-05-15 | 3 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is useful to store submodules in the same repository which contains links to them. Make the UI support this. See https://github.com/twosigma/git-meta/wiki/The-Omega-Repo for information about this strategy Signed-off-by: David Turner <novalis@novalis.org> | ||||
| * | | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' | Annabel Dunstone Gray | 2017-05-15 | 6 | -25/+52 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scope recent searches to project Closes #31902 See merge request !11142 | ||||
| | * | | | | | | Scope recent searches to project | Eric Eastwood | 2017-05-15 | 6 | -25/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902 | ||||
| * | | | | | | | Merge branch 'revert-0663458c' into 'master' | Douwe Maan | 2017-05-15 | 25 | -125/+121 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" See merge request !11395 | ||||
| | * | | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" | Douwe Maan | 2017-05-15 | 25 | -125/+121 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | This reverts merge request !11287 | ||||
| * | | | | | | | Merge branch 'use-gitaly-migrate' into 'master' | Douwe Maan | 2017-05-15 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly_migrate helper on all current migrations in repository See merge request !11309 | ||||
| | * | | | | | | | Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrate | Alejandro Rodríguez | 2017-05-11 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '31106-tabs-alignment' into 'master' | Annabel Dunstone Gray | 2017-05-15 | 7 | -55/+82 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix Resolved Discussions counter wrapping to next line Closes #31106 See merge request !10775 | ||||
| | * | | | | | | | fix Resolved Discussions counter wrapping to next line | Simon Knox | 2017-05-13 | 7 | -55/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large | ||||
| * | | | | | | | | Merge branch 'rename-rendered_title' into 'master' | Rémy Coutable | 2017-05-15 | 7 | -11/+11 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename all references to rendered_title to realtime_changes See merge request !11359 | ||||
| | * | | | | | | | | Rename all references to rendered_title to realtime_changesrename-rendered_title | Luke "Jared" Bennett | 2017-05-13 | 7 | -11/+11 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'bvl-fix-static-analysis-failure-in-users-finder' into 'master' | Rémy Coutable | 2017-05-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix trailing ',' in hash in `user_finder_spec See merge request !11387 | ||||
| | * | | | | | | | | | Fix trailing ',' in hash. | Bob Van Landuyt | 2017-05-15 | 1 | -1/+1 |
| |/ / / / / / / / / |