summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Added migration to reset existing relative_position for issuesValery Sizov2017-03-141-0/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix relative position calculationValery Sizov2017-03-142-8/+39
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master' Sean McGivern2017-03-146-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use the v4 API from the frontend" Closes #28864 See merge request !9714
| * | | | | | | | | | | | | | | | Update API on frontend to use v428864-use-the-v4-api-from-the-frontendSam Rose2017-03-146-11/+11
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use options object to pass params for project endpoint
* | | | | | | | | | | | | | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' Kamil Trzciński2017-03-143-14/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store capybara screenshots as build artifacts Closes #13971 See merge request !7985
| * | | | | | | | | | | | | | | | Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifactsRobert Speicher2016-12-082-12/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Store capybara-screenshots folder as artifacts for RSpec and SpinachRobert Speicher2016-12-081-2/+6
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '29389-fix-already-initialized-constants' into 'master' Robert Speicher2017-03-145-13/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899
| * | | | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constantsRémy Coutable2017-03-135-13/+6
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch '29326-update-documentation' into 'master' Jacob Schatz2017-03-141-2/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds best practices regarding context and vue to documentation See merge request !9870
| * | | | | | | | | | | | | | | | Fix bad code example29326-update-documentationFilipa Lacerda2017-03-131-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 29326-update-documentationFilipa Lacerda2017-03-1312-47/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Resolve transient failure in spec/models/user_spec.rb Execute inflections initializer earlier Fix alignment of resolve discussion button Update templates with new CI variables Fix inconsistent deploy key documentation in UI
| * | | | | | | | | | | | | | | | | Fix code examples and add code highligthFilipa Lacerda2017-03-101-5/+4
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into 29326-update-documentationFilipa Lacerda2017-03-108-56/+166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Using guard clause and added more specs Changelog Fix GitHub Import for open PRs from a fork Add frequently used emojis back to awards menu
| * | | | | | | | | | | | | | | | | Adds best practices regarding context and vue to documentationFilipa Lacerda2017-03-101-1/+32
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-141-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update using_docker_images.md See merge request !9894
| * | | | | | | | | | | | | | | | | Update using_docker_images.mdszymon2017-03-141-3/+7
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'nonewline-parser' into 'master' Sean McGivern2017-03-145-7/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705
| * | | | | | | | | | | | | | | | | take nonewline context into account in diff parsermhasbini2017-03-135-7/+59
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fix/gb/dashboard-commit-status-caching' into 'master' Sean McGivern2017-03-142-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve fragment caching rules at projects dashboard Closes #28364 See merge request !9895
| * | | | | | | | | | | | | | | | Add changelog entry for project status caching fixfix/gb/dashboard-commit-status-cachingGrzegorz Bizon2017-03-141-0/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Improve fragment caching rules at projects dashboardGrzegorz Bizon2017-03-131-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs-good-changelog-bad-changelog' into 'master' Rémy Coutable2017-03-141-24/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand the changelog documentation See merge request !9774
| * | | | | | | | | | | | | | | | Expand the changelog documentationrs-good-changelog-bad-changelogRobert Speicher2017-03-131-24/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds examples of what should and should not get a changelog entry, and examples of good and bad entries. [ci skip]
* | | | | | | | | | | | | | | | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 15 Closes #29361 See merge request !9922
| * | | | | | | | | | | | | | | | Patch 15Xiaogang Wen2017-03-141-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' Sean McGivern2017-03-149-20/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add count badges to both dashboard and group milestones Closes #24421 See merge request !9836
| * | | | | | | | | | | | | | | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestonesAlex Braha Stoll2017-03-109-20/+105
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'lm-docs-clarity' into 'master' Achilleas Pipinellis2017-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update markdown.md example with asterisks and underscores for clarity See merge request !9915
| * | | | | | | | | | | | | | | | Update markdown.md example with asterisks and underscores for claritylm-docs-clarityLee Matos2017-03-131-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-03-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix miswording See merge request !9832
| * | | | | | | | | | | | | | | | Fix miswordingAdrian Sadłocha2017-03-091-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch ↵Stan Hu2017-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28743-actionview-template-error-execjs-disabled-_issuable_meta_data' into 'master' Fix 'ExecJS disabled' error on issues index Closes #28743 See merge request !9916
| * | | | | | | | | | | | | | | | | Fix 'ExecJS disabled' error on issues index 28743-actionview-template-error-execjs-disabled-_issuable_meta_dataJames Edwards-Jones2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurred in production when an issue had an associated MR
* | | | | | | | | | | | | | | | | | Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master' Rémy Coutable2017-03-143-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression in runners registration v1 api See merge request !9904
| * | | | | | | | | | | | | | | | | | Fix regression in runners registration v1 apifix/regression-in-runners-registration-v1-apiTomasz Maczukin2017-03-133-2/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '20450-fix-ujs-actions' into 'master' Alfredo Sumaran2017-03-1428-199/+375
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a button and a post request instead of UJS links - part 1 - Environments See merge request !9688
| * | | | | | | | | | | | | | | | | Use a button and a post request instead of UJS links - part 1 - EnvironmentsFilipa Lacerda2017-03-1428-199/+375
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'fix-missing-blob-permalink-updater-on-blob-show' into 'master' Alfredo Sumaran2017-03-141-23/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing blob line permalink updater on blob:show See merge request !9914
| * | | | | | | | | | | | | | | | Fix missing blob line permalink updater on blob:showfix-missing-blob-permalink-updater-on-blob-showEric Eastwood2017-03-131-23/+21
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9461#note_25288831
* | | | | | | | | | | | | | | | Merge branch 'remove-iifes-1' into 'master' 29399-add-documentation-workflow-to-ciAlfredo Sumaran2017-03-1335-3748/+3683
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove IIFEs for several JS files - Part 1 See merge request !9884
| * | | | | | | | | | | | | | | | fix broken variable referenceremove-iifes-1Mike Greiling2017-03-131-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove IIFEs in preparation for ES module refactorMike Greiling2017-03-1335-3748/+3683
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'use-corejs-polyfills' into 'master' Alfredo Sumaran2017-03-1337-238/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organize our polyfills and standardize on core-js See merge request !9749
| * | | | | | | | | | | | | | | | | Organize our polyfills and standardize on core-jsMike Greiling2017-03-1337-238/+125
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-138-34/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779
| * | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-138-34/+83
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly.
* | | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2017-03-134-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28492-add-dev-documentation-for-using-the-queryrecorder-in-specs' into 'master' Adds docs for QueryRecorder tests Closes #28492 See merge request !9838
| * | | | | | | | | | | | | | | | | Adds docs for QueryRecorder tests28492-add-dev-documentation-for-using-the-queryrecorder-in-specsJames Edwards-Jones2017-03-134-1/+35
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-135-11/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display error message when deleting tag in web UI fails See merge request !9906