summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-126-22/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-125-1/+30
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-1212-44/+64
|\ | | | | | | | | | | | | Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178
| * fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assigneesValery Sizov2017-05-1112-44/+64
| |
* | Merge branch 'refactor-realtime-issue' into 'master' Filipa Lacerda2017-05-1217-262/+543
|\ \ | | | | | | | | | | | | Refactored issue tealtime elements See merge request !11242
| * | Fixed karma spec with elements not appearing in DOMrefactor-realtime-issuePhil Hughes2017-05-111-0/+1
| | |
| * | Remove some weird code to add/remove the task statusPhil Hughes2017-05-115-45/+46
| | | | | | | | | | | | | | | Moved the data into the data method Renamed edited ago class name
| * | Merge branch 'master' into refactor-realtime-issuePhil Hughes2017-05-11286-707/+1715
| |\ \
| * | | Fixed tests on textarea looking for innerText instead of valuePhil Hughes2017-05-103-7/+6
| | | |
| * | | Fixed a bunch of errors with invalid propPhil Hughes2017-05-103-19/+26
| | | | | | | | | | | | | | | | Use v-model on textrea
| * | | Added a bunch of specs for the different componentsPhil Hughes2017-05-104-28/+193
| | | |
| * | | Fixed task status with mobilePhil Hughes2017-05-101-5/+11
| | | |
| * | | Refactored issue tealtime elementsPhil Hughes2017-05-1010-225/+327
| | | | | | | | | | | | | | | | | | | | | | | | This is to match our docs better and will also help a future issue. Also made it possible for the description & title to be readable when JS is disabled
* | | | Merge branch 'import-export-users_select' into 'master' Phil Hughes2017-05-128-605/+609
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Import export users select See merge request !11286
| * | | | Import export users selectLuke "Jared" Bennett2017-05-128-605/+609
|/ / / /
* | | | Merge branch 'as-fix-spec-master' into 'master' Phil Hughes2017-05-122-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use .trigger(‘click’) instead of .click See merge request !11317
| * | | | Use .trigger(‘click’) instead of .clickas-fix-spec-masterAlfredo Sumaran2017-05-112-2/+2
| | | | | | | | | | | | | | | | | | | | This is to improve reliability on mentioned tests
* | | | | Merge branch '29168-copy-commit' into 'master' Phil Hughes2017-05-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move copy button after commit sha Closes #29168 See merge request !11303
| * | | | | Move copy button after commit sha29168-copy-commitAnnabel Dunstone Gray2017-05-111-1/+1
| | | | | |
* | | | | | Merge branch '32096-fix-new-branch-dropdown-position-size' into 'master' Phil Hughes2017-05-122-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new branch dropdown position and size Closes #32096 See merge request !11279
| * | | | | | Fix new branch dropdown position and size32096-fix-new-branch-dropdown-position-sizeEric Eastwood2017-05-102-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32096
* | | | | | | Merge branch 'mk-fix-routable-redirect-message' into 'master' Douwe Maan2017-05-114-12/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redirect message for groups and users See merge request !11313
| * | | | | | | Fix redirect message for groups and usersMichael Kozono2017-05-114-12/+24
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'dm-fix-repository-without-readme' into 'master' Robert Speicher2017-05-112-5/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displaying a repository without a readme Closes #32122 See merge request !11312
| * | | | | | | Fix displaying a repository without a readmedm-fix-repository-without-readmeDouwe Maan2017-05-112-5/+15
| | | | | | | |
* | | | | | | | Merge branch 'fix-remove-cache-key-karma' into 'master' Robert Speicher2017-05-111-3/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary cache definition in rake karma test Closes #32119 See merge request !11306
| * | | | | | | Remove unnecessary cache definition in rake karma testStan Hu2017-05-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32119
* | | | | | | | Merge branch 'pipeline-schedules-callout-docs-url' into 'master' Filipa Lacerda2017-05-115-11/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set correct docsUrl in pipeline schedules callout component. Closes #31957 See merge request !11216
| * | | | | | | | Pass docsUrl to pipeline schedules callout component.pipeline-schedules-callout-docs-urlBryce Johnson2017-05-115-11/+37
| | | | | | | | |
* | | | | | | | | Merge branch '28558-update-copy' into 'master' Filipa Lacerda2017-05-111-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update copy on Create merge request dropdown See merge request !11304
| * | | | | | | | | Update copy on Create merge request dropdownAlfredo Sumaran2017-05-111-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch '32091-empty-pipeline-svg' into 'master' Filipa Lacerda2017-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix overlapping lines in SVG Closes #32091 See merge request !11299
| * | | | | | | | | Fix overlapping lines in SVGAnnabel Dunstone Gray2017-05-111-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'remove-balsamiq-module-from-common_vue-bundle' into 'master' Filipa Lacerda2017-05-111-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove balsamiq module from common_vue bundle Closes #32092 See merge request !11248
| * | | | | | | | | Remove balsamiq module from common_vue bundleremove-balsamiq-module-from-common_vue-bundleLuke "Jared" Bennett2017-05-101-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'winh-sidebar-mock-fix' into 'master' Filipa Lacerda2017-05-113-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing tear down of sidebarMockInterceptor Closes #32020 See merge request !11204
| * | | | | | | | | Add missing tear down of sidebarMockInterceptor (!11204)winh-sidebar-mock-fixwinh2017-05-113-0/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'use-common-vue-for-filtered-search' into 'master' Clement Ho2017-05-114-5/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure filtered_search utilizes common_vue bundle See merge request !11273
| * | | | | | | | | | ensure filtered_search utilizes common_vue bundleuse-common-vue-for-filtered-searchMike Greiling2017-05-104-5/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-pipeline-author-link' into 'master' Filipa Lacerda2017-05-119-218/+149
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to commit author user page from pipelines Closes #29368 See merge request !11100
| * | | | | | | | | | Link to commit author user page from pipelines (!11100)winh2017-05-112-8/+11
| | | | | | | | | | |
| * | | | | | | | | | Add failing test for #29368winh2017-05-111-11/+79
| | | | | | | | | | |
| * | | | | | | | | | Replace pipeline mock data with JSON fixturewinh2017-05-107-202/+62
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'update-database-requirements' into 'master' Rémy Coutable2017-05-111-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update DB requirements in the documentation See merge request !11293
| * | | | | | | | | | | Update DB requirements in the documentationupdate-database-requirementsYorick Peterse2017-05-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more obvious that we greatly prefer PostgreSQL over MySQL/MariaDB and that all users are recommended to use PostgreSQL instead. This also removes the paragraph mentioning the size per user row, as this is completely inaccurate and doesn't really help users with anticipating the database size. Instead we now simply recommend users to have at least 5-10 GB of storage at minimum. [ci skip]
* | | | | | | | | | | | Merge branch 'zj-clean-up-ci-variables-table' into 'master' Yorick Peterse2017-05-117-5/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up ci variables table Closes #31799 See merge request !11186
| * | | | | | | | | | | | Remove rails dependent: :destroy statementZ.J. van de Weg2017-05-115-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforced by the database, and no callbacks need to be called. Combined with 7b9b2c6099 and 294a8b8a6d this resolves gitlab-org/gitlab-ce#31799
| * | | | | | | | | | | | Add a foreign key to ci_variables to projectsZ.J. van de Weg2017-05-113-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variables shouldn't exist without a project, so a foreign key was added with CASCADE'ing effects.
| * | | | | | | | | | | | Prevent NULL values on ci_variables columnsZ.J. van de Weg2017-05-111-0/+12
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be more specific; key, and project_id. If either of these is NULL its wrong, because: 1. storing a key value pair without key is just plain wrong 2. all variables should belong to a project Non of these cases existed on the staging database.
* | | | | | | | | | | | Merge branch 'bvl-mysql-rename-concurrently' into 'master' Yorick Peterse2017-05-111-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new column before creating rename triggers See merge request !11297