summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use js-issuable-editshow-inline-edit-btnClement Ho2017-12-123-4/+4
* Merge branch 'master' into 'show-inline-edit-btn'Clement Ho2017-12-12248-1530/+2637
|\
| * Merge branch 'single-list-multiple-clusters' into 'master'Kamil Trzciński2017-12-126-68/+13
| |\
| | * Remove Add Cluster button in clusters/indexsingle-list-multiple-clustersMatija Čupić2017-12-111-2/+0
| | * Change copy on list headerChris Peressini2017-12-111-1/+1
| | * Add CHANGELOG entryMatija Čupić2017-12-111-0/+5
| | * Remove tab navigation from clusters/indexMatija Čupić2017-12-113-35/+8
| | * Remove cluster scope from ClustersController#indexMatija Čupić2017-12-112-33/+2
| * | Merge branch 'rc/backport-ee-fix' into 'master'Kamil Trzciński2017-12-121-18/+8
| |\ \
| | * | Backport a spec fix done in EE (5dbecb8e) to CERémy Coutable2017-12-111-18/+8
| * | | Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-125-2/+37
| |\ \ \
| | * | | Use message body for merge request descriptionjprovazn-descriptionJan Provaznik2017-12-115-2/+37
| * | | | Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-lo...Douwe Maan2017-12-121-0/+6
| |\ \ \ \
| | * | | | Clears the current Appearance cache otherwise it breaks since new_project_gui...41041-undefined-method-new_project_guidelines_html-unable-to-load-from-cacheRémy Coutable2017-12-121-0/+6
| |/ / / /
| * | | | Merge branch 'add-js-prefix-issuable-edit' into 'master'Filipa Lacerda2017-12-126-8/+8
| |\ \ \ \
| | * | | | Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-086-8/+8
| * | | | | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'Filipa Lacerda2017-12-124-168/+255
| |\ \ \ \ \
| | * | | | | Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-buildEric Eastwood2017-12-112-205/+215
| | * | | | | Try to clean up legit Vue error that was patched overEric Eastwood2017-12-103-25/+92
| | * | | | | Add Vue errorHandlor to remove rogue logged TypeErrorsEric Eastwood2017-12-101-1/+11
| * | | | | | Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master'Filipa Lacerda2017-12-121-0/+0
| |\ \ \ \ \ \
| | * | | | | | Updated image for diff navigation docsdiff-file-navigation-doc-screenshot-docsPhil Hughes2017-12-121-0/+0
| * | | | | | | Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-126-21/+39
| |\ \ \ \ \ \ \
| | * | | | | | | Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-urlDouwe Maan2017-12-126-21/+39
| * | | | | | | | Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal...Kamil Trzciński2017-12-122-8/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-buildShinya Maeda2017-12-122-8/+22
| * | | | | | | | | Merge branch '40997-pipeline-null' into 'master'Phil Hughes2017-12-122-11/+61
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Check for null in job tooltip title40997-pipeline-nullFilipa Lacerda2017-12-112-11/+61
| * | | | | | | | | Merge branch 'milestone-sidebar-docs' into 'master'Sean McGivern2017-12-123-4/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Milestone sidebar docsVictor Wu2017-12-123-4/+6
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'fix-remove-branch-name-migration' into 'master'Sean McGivern2017-12-122-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix migration that removes issues.branch_namefix-remove-branch-name-migrationYorick Peterse2017-12-112-1/+1
| * | | | | | | | | | Merge branch 'winh-i18n-placeholder-names' into 'master'Tim Zallmann2017-12-121-0/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Clarify casing of I18N placeholder nameswinh-i18n-placeholder-namesWinnie Hellmann2017-12-111-0/+3
| * | | | | | | | | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'Tim Zallmann2017-12-1215-47/+34
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignmentEric Eastwood2017-12-0815-47/+34
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'issue-note-rename' into 'master'Fatih Acet2017-12-1113-36/+36
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | rename remaining issue_ prefixed filesissue-note-renameSimon Knox2017-12-0913-36/+36
| * | | | | | | | | | | Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'Stan Hu2017-12-112-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Ignore temporary table in schemaMichael Kozono2017-12-112-0/+7
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-114-55/+46
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Unify mirror addition operations to prepare for Gitaly migrationgitaly-mirroring-prepAlejandro Rodríguez2017-12-063-19/+20
| | * | | | | | | | | | | Add feature flag to use gitaly-ssh mirroring when cloning internal reposAlejandro Rodríguez2017-12-063-38/+28
| * | | | | | | | | | | | Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-1111-82/+151
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Backport epic in issueepic-in-issuebackport-epic-in-issueClement Ho2017-12-0711-82/+151
| * | | | | | | | | | | | Merge branch 'fix_js_style_guide_markup' into 'master'Rémy Coutable2017-12-111-62/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | fixes some markup issues in the js style guide docsChristiaan Van den Poel2017-12-111-62/+60
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'url-utility-es-module' into 'master'Filipa Lacerda2017-12-1150-188/+188
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | updated importsurl-utility-es-modulePhil Hughes2017-12-1114-29/+29
| | * | | | | | | | | | | Merge branch 'master' into 'url-utility-es-module'Phil Hughes2017-12-11143-1094/+2820
| | |\ \ \ \ \ \ \ \ \ \ \