summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix import order lintpsimyn-vue-shared-noteSimon Knox2017-11-3012-20/+20
* remove notes entrypointSimon Knox2017-11-303-3/+2
* move notes app to vue_sharedSimon Knox2017-11-3048-109/+112
* rename remaining issue_note componentsSimon Knox2017-11-3010-18/+17
* rename notes_appSimon Knox2017-11-303-7/+7
* Merge branch 'psimyn-issue-note-refac' into psimyn-mr-noteSimon Knox2017-11-30193-842/+3791
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into psimyn-issue-no...Simon Knox2017-11-29172-762/+3712
| |\
| | * Merge branch 'backport-border-inline-edit' into 'master'Fatih Acet2017-11-296-13/+20
| | |\
| | | * Backport border inline editbackport-border-inline-editClement Ho2017-11-286-13/+20
| | * | Merge branch 'backport-epic-tasklist' into 'master'Fatih Acet2017-11-296-42/+86
| | |\ \
| | | * | Backport epic tasklistClement Ho2017-11-296-42/+86
| | |/ /
| | * | Merge branch 'an/gitaly-timeouts' into 'master'Rémy Coutable2017-11-2913-24/+231
| | |\ \
| | | * | Add timeouts for Gitaly callsAndrew Newdigate2017-11-2913-24/+231
| | |/ /
| | * | Merge branch 'dm-search-pattern' into 'master'Sean McGivern2017-11-2917-85/+84
| | |\ \
| | | * | Use fuzzy search with minimum length of 3 characters where appropriatedm-search-patternDouwe Maan2017-11-2714-54/+39
| | | * | Modify fuzzy_arel_match to search for equality when a term shorter than 3 cha...Douwe Maan2017-11-272-7/+30
| | | * | Rename to_fuzzy_arel to fuzzy_arel_matchDouwe Maan2017-11-243-10/+10
| | | * | Use Gitlab::SQL::Pattern where appropriateDouwe Maan2017-11-248-25/+16
| | * | | Merge branch 'remove-empty-scss-file' into 'master'Phil Hughes2017-11-291-0/+0
| | |\ \ \
| | | * | | Remove empty new-nav.scssremove-empty-scss-fileAnnabel Dunstone Gray2017-11-271-0/+0
| | * | | | Merge branch 'fix_invalid_new_pipeline_form' into 'master'Filipa Lacerda2017-11-293-0/+18
| | |\ \ \ \
| | | * | | | initializes the branches dropdown upon invalid entryChristiaan Van den Poel2017-11-273-0/+18
| | * | | | | Merge branch '40638-star-icon' into 'master'Clement Ho2017-11-281-8/+1
| | |\ \ \ \ \
| | | * | | | | Fix star icon color/strokeAnnabel Dunstone Gray2017-11-281-8/+1
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'be-wary-of-typos' into 'master'Stan Hu2017-11-281-1/+1
| | |\ \ \ \ \
| | | * | | | | I am certainly weary of debugging sidekiq but I don't think that's what was m...be-wary-of-typosGreg Stark2017-11-281-1/+1
| | * | | | | | Merge branch '38962-automatically-run-a-pipeline-when-auto-devops-is-turned-o...Kamil Trzciński2017-11-2821-163/+558
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Add checkboxes to automatically run AutoDevops pipelineEric Eastwood2017-11-2812-30/+187
| | | * | | | | BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-2810-133/+371
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch '40373-fix-issue-note-submit-disabled-on-paste' into 'master'Clement Ho2017-11-282-1/+7
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix issue comment submit button disabled on GFM pasteEric Eastwood2017-11-282-1/+7
| | * | | | | Merge branch '40459-svg-icon-fix' into 'master'Annabel Dunstone Gray2017-11-288-60/+69
| | |\ \ \ \ \
| | | * | | | | override a:focus styles. fix Commit page pipeline icon40459-svg-icon-fixSimon Knox2017-11-233-9/+17
| | | * | | | | readd missing text-primary. remove unused svg stylesSimon Knox2017-11-232-6/+5
| | | * | | | | fix some icon colors. move text-color styles to common.scssSimon Knox2017-11-236-52/+54
| | * | | | | | Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-ha...Rémy Coutable2017-11-289-21/+99
| | |\ \ \ \ \ \
| | | * | | | | | Ensure MRs always use branch refs for comparisonSean McGivern2017-11-289-21/+99
| | * | | | | | | Merge branch 'rs-fix-gemfile-lock' into 'master'Yorick Peterse2017-11-281-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Lock seed-fu at the correct version in Gemfile.lockRobert Speicher2017-11-281-1/+1
| | |/ / / / / /
| | * | | | | | Merge branch 'zj-controller-action-gitaly-metrics' into 'master'Rémy Coutable2017-11-281-7/+42
| | |\ \ \ \ \ \
| | | * | | | | | Add controller#action metrics on GitalyZeger-Jan van de Weg2017-11-281-7/+42
| | * | | | | | | Merge branch 'default-values-for-mr-states' into 'master'Sean McGivern2017-11-285-3/+91
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix defaults for MR states and merge statusesdefault-values-for-mr-statesYorick Peterse2017-11-245-3/+91
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'hashed-storage-attachments-migration-path' into 'master'Nick Thomas2017-11-2814-150/+523
| | |\ \ \ \ \ \ \
| | | * | | | | | | Changes to Attachments Migration for EE and Geo compatibilityGabriel Mazetto2017-11-283-8/+22
| | | * | | | | | | Backport EE changes to make test possible when prepending modulesGabriel Mazetto2017-11-243-6/+18
| | | * | | | | | | fix exclusive lease specs fro hashed storage migrationGabriel Mazetto2017-11-232-9/+15
| | | * | | | | | | Changelog and Documentation for storage migration of project attachmentsGabriel Mazetto2017-11-232-13/+89
| | | * | | | | | | Codestyle changes and Added Exclusive Lease to hashed storage migrationGabriel Mazetto2017-11-233-15/+57
| | | * | | | | | | when rollingback repository migration, toggle readonly mode backGabriel Mazetto2017-11-233-6/+8