summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'fix-retried-for-mysql' into 'master'9-2-stable-fix-conflicts-for-mr-11593Timothy Andrew2017-05-222-0/+74
|/ | | | | | | | | | | Fixes broken MySQL migration for retried Closes #32647 See merge request !11593 Conflicts: db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
* Update VERSION to 9.2.0-rc7v9.2.0-rc7Regis2017-05-191-1/+1
|
* Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-195-2/+250
| | | | | | | | Fix incorrect renaming migrations Closes #32526 and #32530 See merge request !11515
* Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-1912-313/+645
| | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498
* Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-193-2/+18
| | | | | | | Refine MR widget styling for buttons and info text Closes #32595 See merge request !11548
* Merge branch '28558-update-copy' into 'master' Filipa Lacerda2017-05-191-2/+2
| | | | | Update copy on Create merge request dropdown See merge request !11304
* Merge branch '9-2-stable-fix-conflicts-for-mr-11189' into '9-2-stable'Regis Boudinot2017-05-195-29/+23
|\ | | | | | | | | Fix 9.2 conflicts for "Automatically close user dropdown for CE" See merge request !11530
| * Remove incorrectly picked styles9-2-stable-fix-conflicts-for-mr-11189kushalpandya2017-05-201-4/+0
| |
| * Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-193-1/+18
| |\ | |/ |/|
* | Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-192-0/+13
| | | | | | | | | | Paste a copied MR source branch name as code when pasted into a GFM form See merge request !11315
* | Merge branch '9-2-stable-fix-conflicts-for-mr-11547' into '9-2-stable'Regis Boudinot2017-05-191-1/+5
|\ \ | | | | | | | | | | | | Fix 9.2 conflicts for "Replaced duplicate z-index with index of 400" See merge request !11557
| * | Resolve header.scss conflictsLuke "Jared" Bennett2017-05-191-3/+0
| | |
| * | Merge branch 'fix-header-z-index' into 'master'9-2-stable-fix-conflicts-for-mr-11547Annabel Dunstone Gray2017-05-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced duplicate z-index with index of 400 Closes #32609 See merge request !11547 Conflicts: app/assets/stylesheets/framework/header.scss
| | * Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-19170-1362/+2947
| | |\ | |_|/ |/| |
* | | Merge branch 'tab-title-blank' into '9-2-stable'Regis Boudinot2017-05-191-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Correctly set title_text with API data See merge request !11554
| * | | Correctly set title_text with API datatab-title-blankPhil Hughes2017-05-191-2/+2
| | | |
* | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11391' into '9-2-stable'Clement Ho2017-05-194-7/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix 9.2 conflicts for "Fix unassigned checkmark"` See merge request !11528
| * | | | Fix conflicts9-2-stable-fix-conflicts-for-mr-11391Clement Ho2017-05-191-147/+16
| | | | |
* | | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11463' into '9-2-stable'Regis Boudinot2017-05-192-26/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 9.2 conflicts for "Refactored the anchor tag to remove the trailing space in the target branch" See merge request !11526
| * | | | | Resolve mr_widget_header conflict9-2-stable-fix-conflicts-for-mr-11463Jose Ivan Vargas2017-05-191-29/+0
| | | | | |
| * | | | | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-192-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463 Conflicts: app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
* | | | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' ↵Annabel Dunstone Gray2017-05-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Side by side MR discussion should stretch to max width" Closes #32556 See merge request !11508
* | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵Filipa Lacerda2017-05-194-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532
* | | | | | Merge branch '32602-add-docs-for-remove-filter-in-search-bar' into 'master'Achilleas Pipinellis2017-05-193-2/+6
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for "Remove Filter in Search Bar" Closes #32602 See merge request !11541
* | | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan2017-05-1915-208/+276
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream" See merge request !11533
| * | | | Fix 9.2 conflicts for 'Fix conflict resolution from corrupted upstream'9-2-stable-fix-conflicts-for-mr-11298Douwe Maan2017-05-194-107/+8
| | | | |
| * | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-1915-107/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298 Conflicts: app/models/merge_request.rb spec/models/merge_request_spec.rb
* | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-199-67/+118
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
* | | | Merge branch '32583-update-prometheus-merge-request-widget-documentation' ↵Achilleas Pipinellis2017-05-192-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update Prometheus Merge Request widget documentation Closes #32583 See merge request !11531
* | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11427' into '9-2-stable'Douwe Maan2017-05-191-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix 9.2 conflicts for "Scroll to anchor when blob content is loaded" See merge request !11484
| * | | | Fixed merging conflict on the blob load viewer9-2-stable-fix-conflicts-for-mr-11427Tim Zallmann2017-05-191-39/+1
| | | | |
| * | | | Merge branch 'dm-scroll-to-blob-user-content' into 'master'Douwe Maan2017-05-181-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll to anchor when blob content is loaded See merge request !11427 Conflicts: app/assets/javascripts/blob/viewer/index.js
* | | | | Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Run the schedule worker once an hour by default See merge request !11476
* | | | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add refresh button into MR widget failed state. Closes #32543 See merge request !11519
* | | | | Fix deployment status icon and alignment on 9-2-stable branchkushalpandya2017-05-191-1/+1
| | | | |
* | | | | Fix incorrect import for `UsersSelect` on 9-2-stable branchkushalpandya2017-05-191-1/+0
| | | | |
* | | | | Merge branch '32074-failed-build' into 'master' Phil Hughes2017-05-192-102/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken test - load correct data Closes #32074 See merge request !11237
* | | | | Merge branch 'fix/allow-accessing-appearance-images' into 'master'Rémy Coutable2017-05-193-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes the 500 for custom apearance header logo and logo See merge request !11479
* | | | | Remove line referencing an non-existing class in the 9-2-stable branchRémy Coutable2017-05-191-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix-main-bundle-sans-vue' into 'master' Clement Ho2017-05-192-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent vue.esm.js from being bundled into the primary JS bundle Closes #31966 See merge request !11177
* | | | | Merge branch 'issue-boards-sidebar-create-new-label-404-error' into 'master' Filipa Lacerda2017-05-193-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed create label form not working on issue boards in a sub-group project Closes #31862 See merge request !11182
* | | | | Merge branch 'fix-search-not-highlighting' into 'master'Filipa Lacerda2017-05-193-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed search terms not highlight Closes #31997 See merge request !11198
* | | | | Merge branch 'winh-german-cycle-analytics' into 'master' Douwe Maan2017-05-193-70/+74
| | | | | | | | | | | | | | | | | | | | | | | | | Add German translation for Cycle Analytics See merge request !11161
* | | | | Merge branch '32021-job-component-test-failure' into 'master' Fatih Acet2017-05-191-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix test failure in job vue componenFix test failure in job vue componentt Closes #32021 See merge request !11208
* | | | | Merge branch 'pipeline-schedules-callout-docs-url' into 'master' Filipa Lacerda2017-05-195-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set correct docsUrl in pipeline schedules callout component. Closes #31957 See merge request !11216
* | | | | Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master' Filipa Lacerda2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed the stage title translation in cycle analytics See merge request !11252
* | | | | Merge branch ↵Kamil Trzciński2017-05-192-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon' into 'master' Adds pipeline id to 'Last Pipeline' link in pipeline schedules Closes #32103 See merge request !11258
* | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-195-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable animations for tests Closes #32194 See merge request !11324
* | | | | Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu2017-05-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499
* | | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-192-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31886 Remove spinner from loading comment Closes #31886 See merge request !11339