summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2017-03-161-0/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest a more secure way of handling SSH host keys in docker builds [ci skip] See merge request !2797
| * | | | | | | | | | | Suggest a more secure way of handling SSH host keys in docker buildsMaxime Besson2017-02-241-0/+14
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/gb/speed-up-gitlab-qa-docker-image-builds' into 'master' Rémy Coutable2017-03-163-1/+66
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up GitLab QA docker image builds Closes gitlab-qa#33 See merge request !10000
| * | | | | | | | | | | Speed up GitLab QA docker image buildsfeature/gb/speed-up-gitlab-qa-docker-image-buildsGrzegorz Bizon2017-03-163-1/+66
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-expand-changelog-examples' into 'master' Rémy Coutable2017-03-161-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand on the good changelog/bad changelog documentation examples See merge request !10016
| * | | | | | | | | | | | Expand on the good changelog/bad changelog documentation examplesRobert Speicher2017-03-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'fixed-issue-boards-modal-not-searching' into 'master' Filipa Lacerda2017-03-162-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed search not working in issue boards modal See merge request !10010
| * | | | | | | | | | | | Fixed search not working in issue boards modalfixed-issue-boards-modal-not-searchingPhil Hughes2017-03-162-1/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tc-clean-up-no-label-doc' into 'master' Sean McGivern2017-03-162-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the use of "No Label" in the labels description See merge request !9993
| * | | | | | | | | | | | | Put the use of "No Label" in the descriptiontc-clean-up-no-label-docToon Claes2017-03-162-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get the issues that have no label, the special keyword `No Label` can be used. This `No Label` label can be used like any other label.
* | | | | | | | | | | | | | Merge branch 'doc_about_branch_creation_in_empty_repo' into 'master' Sean McGivern2017-03-161-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document a New Branch feature for Bare Projects See merge request !9996
| * | | | | | | | | | | | | | Document a New Branch feature for Bare ProjectsValery Sizov2017-03-161-0/+7
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-162-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve TODOs performance See merge request !10004
| * | | | | | | | | | | | | Include routes when loading user projectsJarka Kadlecova2017-03-162-2/+24
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '29529-quick-fix' into 'master' Sean McGivern2017-03-162-15/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure not valid anymore labels don't break issue pages Closes #29529 See merge request !9995
| * | | | | | | | | | | | This quick-fixes an issue with existing award emoji not being valid anymoreRémy Coutable2017-03-162-15/+18
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Emoji#gl_emoji_tag now returns early instead of raising a 500 error. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '28991-viewing-old-wiki-page-version-edit-button-exists' into ↵29565-name-of-the-uncompressed-folder-of-a-tag-archive-changedRémy Coutable2017-03-164-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#28991] Resolve "Viewing old wiki page version, "Edit" button exists, brings up latest markup" Closes #28991 See merge request !9966
| * | | | | | | | | | | [#28991] Wiki page edit button only appears on the current commit pageTM Lee2017-03-164-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added method to check if the current Page version is the current latest version - Conditionally checks for current version when showing Edit button - Added feature specs for viewing project wiki page and expect edit button - Added Changelog
* | | | | | | | | | | | Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master' Yorick Peterse2017-03-1615-10/+408
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up several project lists See merge request !9903
| * | | | | | | | | | | Build project cache key in a helper27376-cache-default-branch-pipeline-on-projectBob Van Landuyt2017-03-165-2/+59
| | | | | | | | | | | |
| * | | | | | | | | | | Eager load route & namespace in `Explore::ProjectsController`Bob Van Landuyt2017-03-161-3/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Update the cache key to only include what is requiredBob Van Landuyt2017-03-161-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Don't try to load status when there is no commitBob Van Landuyt2017-03-162-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen when the repository is missing. In which case cache needs to be cleared
| * | | | | | | | | | | Eager load route for project & namespaceBob Van Landuyt2017-03-161-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Render cached pipeline status on project dashboardBob Van Landuyt2017-03-164-3/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Update the pipeline cache when updating a pipeline-statusBob Van Landuyt2017-03-162-0/+19
| | | | | | | | | | | |
| * | | | | | | | | | | Add a wrapper for pipeline statusesBob Van Landuyt2017-03-162-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reads status from redis & stores it in redis if it was missing. If the project has no HEAD, the cache is deleted
| * | | | | | | | | | | Test showing pipelines on the dashboardBob Van Landuyt2017-03-162-2/+28
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/gb/fix-timeouts-in-manual-actions-migration' into 'master' Yorick Peterse2017-03-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix statements timeout in manual actions migration Closes #29526 See merge request !9989
| * | | | | | | | | | | | Fix statements timeout in manual actions migrationfix/gb/fix-timeouts-in-manual-actions-migrationGrzegorz Bizon2017-03-161-0/+4
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix_visibility_level' into 'master' Sean McGivern2017-03-163-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility level on new project page Closes #19253 See merge request !9885
| * | | | | | | | | | | | Use digblackst0ne2017-03-141-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix rubocop offensesblackst0ne2017-03-121-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix specsblackst0ne2017-03-121-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactor specsblackst0ne2017-03-121-6/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update specsblackst0ne2017-03-111-1/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added specsblackst0ne2017-03-111-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix_visibility_levelblackst0ne2017-03-1194-806/+1766
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix visibility level on new project pageblackst0ne2017-03-112-1/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'chore/23493-remaining-time-tooltip' into 'master' Rémy Coutable2017-03-164-7/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue milestone remaining time tooltip See merge request !9536
| * | | | | | | | | | | | | | Issue milestone remaining time tooltipMichael2017-03-164-7/+83
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-1612-55/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo mark all as done' to Todos Closes #27114 See merge request !9890
| * | | | | | | | | | | | | Add 'Undo mark all as done' to TodosJacopo2017-03-1612-55/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to 'Undo mark all as done' todos marked as complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard. The operation undos only the todo previously marked as done with the 'Mark al as done' button.
* | | | | | | | | | | | | | Merge branch 'duplicate-pagination-group-explore' into 'master' Filipa Lacerda2017-03-161-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed duplicate pagination on explore#groups Closes #29531 See merge request !9988
| * | | | | | | | | | | | | | Fixed duplicate pagination on explore#groupsduplicate-pagination-group-explorePhil Hughes2017-03-161-2/+0
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #29531
* | | | | | | | | | | | | | Merge branch 'fix-legacy-emojis-using-unicode-file-name' into 'master' Sean McGivern2017-03-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore unicode file name images for legacy img emojis See merge request !9986
| * | | | | | | | | | | | | | Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-nameEric Eastwood2017-03-161-0/+2
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'remove-es6-extension-configuration' into 'master' Filipa Lacerda2017-03-169-16/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remaining references to .es6 file extension in our config files and documentation See merge request !9980
| * | | | | | | | | | | | | | remove all references to the .es6 in our config files and documentationremove-es6-extension-configurationMike Greiling2017-03-159-16/+14
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'issue-boards-modal-filter-bar' into 'master' Filipa Lacerda2017-03-1621-459/+210
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added filter bar into add issues modal See merge request !9856