Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-25Fix race condition during project deletionfix-soft-deleted-projects-not-actually-deletedRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-25Merge branch 'zj-slash-commands-improvements' into 'master' Kamil Trzciński
Slash commands improvements See merge request !7638
2016-11-25Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse
Resolve "Reduce queries in API::Helpers#find_project" See merge request !7714
2016-11-25Accept a valid ref for issue showZ.J. van de Weg
For example, now we support `/gitlab issue show #1`. Where the # used to trip the regex.
2016-11-25Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński
Improve how we could cancel pipelines: Improve how we could cancel pipelines: * Introduce `HasStatus.cancelable` which we might be able to cancel * Cancel and check upon `cancelable` * Also cancel on `CommitStatus` rather than just `Ci::Build` Fixes #23635 Fixes #17845 See merge request !7508
2016-11-25Merge branch 'autocomplete-space-prefix' into 'master' Fatih Acet
Allow GFM autocomplete to be trigger without the preceding space ## What does this MR do? Gives the ability to GFM autocomplete to be trigger even if there is no preceding space. I've taken the regex from the at.js plugin & tweaked it to allow the leading character to be a special character. ## What are the relevant issue numbers? Closes #19975 ## Screenshots (if relevant) ![Screen_Shot_2016-07-21_at_14.41.34](/uploads/19684ba286baeedb754e7457945480a8/Screen_Shot_2016-07-21_at_14.41.34.png)![Screen_Shot_2016-07-21_at_14.41.40](/uploads/a77349bce599ae93b4bcddd355087f5c/Screen_Shot_2016-07-21_at_14.41.40.png)![Screen_Shot_2016-07-21_at_14.41.46](/uploads/c35df17b678b24b73c94b181f0784188/Screen_Shot_2016-07-21_at_14.41.46.png) See merge request !5395
2016-11-25Merge branch 'issue_24748' into 'master' Fatih Acet
Fix title case to sentence case in "Add Todo" ## What does this MR do? Implements sentence case for `Add Todo` ## Are there points in the code the reviewer needs to double check? I changed the images used in the file `doc/workflow/todos.md` to show the new look. ## Why was this MR needed? #24748 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-21_at_12.03.21_PM](/uploads/225abe2901aacccea697596853bdc52c/Screen_Shot_2016-11-21_at_12.03.21_PM.png) ![Screen_Shot_2016-11-21_at_11.58.17_AM](/uploads/3a5997eb6bb037f1c581d9925fa288ce/Screen_Shot_2016-11-21_at_11.58.17_AM.png) After ![Screen_Shot_2016-11-21_at_12.03.38_PM](/uploads/3be4d58e5adaa10fab759f8726a4d257/Screen_Shot_2016-11-21_at_12.03.38_PM.png) ![Screen_Shot_2016-11-21_at_11.58.37_AM](/uploads/016cdb32cb1e87e9e3cfd89309b53a4a/Screen_Shot_2016-11-21_at_11.58.37_AM.png) ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #24748 See merge request !7724
2016-11-25Merge branch 'issue_24958' into 'master' Rémy Coutable
Fix bad selection on dropdown menu for tags filter Fixes #24958 See merge request !7750
2016-11-25Fix bad selection on dropdown menu for tags filterLuis Alonso Chavez Armendariz
2016-11-25Merge branch 'rephrase-system-notes' into 'master' Robert Speicher
Rephrase some system notes to be compatible with new system note style See merge request !7692
2016-11-25Merge branch 'fix/invalid-storage-cleanup-affecting-test-suite' into 'master' Robert Speicher
Make test suite deterministic when storage is involved ## What does this MR do? This MR fixes our RSpec test harness because one test example could affect subsequent examples if objects created with `let` had associated files stored in `tmp/tests`. We store files using CarrierWave, but we also have some custom storage rules for CI builds. Some time ago we introduced MR that purged CarrierWave uploads after each run of entire test suite https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3435, but this is not enough, as we should isolate each test example to be able to rely on deterministic test suite. Not cleaning uploads between each test example run, makes it impossible to know if preconditions are correct before test example starts to run, therefore it makes test examples, that use storage, unreliable. This MR is an attempt to improve that. ## What are the relevant issue numbers? Closes #24808 See merge request !7695
2016-11-25Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher
Update grape-entity to 0.6.0 See merge request !7491
2016-11-24Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into ↵Fatih Acet
'master' resolves updated and resolved status is not showing ## What does this MR do? This MR fixes #24780 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MRs removes some important information as par suggested design in #19797. it restores that information ## Screenshots (if relevant) **Before:** ![before](/uploads/a93091e783de3e550a07ddbc1fa8085a/before.png) **After:** ![after](/uploads/ceb7f64a6f20155abcf6ea49d4b8059e/after.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24780 See merge request !7655
2016-11-24Merge branch 'resolve-discussions-timeago' into 'master' Fatih Acet
Fixed resolved discussion timeago not rendering ## What does this MR do? Initialises the timeago element when a discussion is updated or resolved. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png) ## What are the relevant issue numbers? Closes #24787 See merge request !7656
2016-11-24Merge branch 'fixed-commit-timeago' into 'master' Fatih Acet
Fixed commit time not rendering after initial page load ## What does this MR do? Inits the timeago for commits when infinite scrolling which fixes the issue of the timeago not rendering correctly when scrolling down. ## What are the relevant issue numbers? Closes #24862 See merge request !7704
2016-11-24Merge branch '23813-fix-username-character-validation-message' into 'master' Fatih Acet
Properly escape username validation error ## What does this MR do? Prevents the double-escaping of the username validation error when attempting to change one's username using an invalid character. Go to [/profile/account](https://gitlab.com/profile/account) and attempt to add an invalid character like `@` or `#` to your username to trigger this message. ## Screenshots (if relevant) #### Before: ![user-name-change](/uploads/8e509ca8a22e40fd51c3c1919e9c6871/user-name-change.png) #### After: ![Screen_Shot_2016-11-23_at_5.23.52_PM](/uploads/3e868128724e6af07d1193494ec25941/Screen_Shot_2016-11-23_at_5.23.52_PM.png) ## Does this MR meet the acceptance criteria? - [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~ - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23813 See merge request !7725
2016-11-24Merge branch 'issue-boards-scrollable-element' into 'master' Fatih Acet
Fixed issue boards scrolling with a lot of lists & issues ## What does this MR do? When an issue board has a lot of lists & each list has a lot of issues scrolling can be tricky. This changes that by making the element that scrolls the `board-list` div. This is ok because sorting inside each list isn't possible, it will need re-thinking when sorting is possible but this fixes the bug for now. See merge request !7748
2016-11-24Merge branch 'remove-backup-strategies' into 'master' Stan Hu
Stop supporting Google Cloud and Azure as backup strategies ## What does this MR do? It removes support for Azure and Google Cloud as backup strategies (via Fog). Motivation behind this decision can be found in !4928, !6713 but basically they require a lot of gems that are unrelated to the backup use-case. ## Are there points in the code the reviewer needs to double check? Am I missing any other location where we'd use these gems? See merge request !7739
2016-11-24Merge branch 'boards-issue-sorting' into 'master' Fatih Acet
Fixed issue boards issue sorting when dragging issue into list ## What does this MR do? Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom. This changes that by adding the issue at the specific index. ## Screenshots (if relevant) ![boards-sorting](/uploads/9aa4a0cb5e0be79e7d24ab2b6abb0bbb/boards-sorting.gif) See merge request !7734
2016-11-24Fixed issue boards scrolling with a lot of lists & issuesPhil Hughes
When a board has a lot of lists & issues scrolling stops the user from moving the issue to the lsat list (or any list not on screen). This changes that by making the scrollable element the board-list element. This will need re-thinking when sorting in lists is possible.
2016-11-24Merge branch ↵Fatih Acet
'24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics' into 'master' Pick valid event objects for the events list ## What does this MR do? Fixes JS error when loading events with possible `null` objects ## What are the relevant issue numbers? Closes #24836 See merge request !7689
2016-11-24API: Introduce `#find_group!` which also check access permissionRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch 'fix-api-projects-docs' into 'master' Sean McGivern
You can only assign default_branch when editing a project Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7726 See merge request !7741
2016-11-24You can only assign default_branch when editing a project or when creating a ↵Robert Schilling
project for a specified user [ci skip] You can only assign default_branch when editing a project [ci skip]
2016-11-24Merge branch '24779-last-deployment-call-on-nil-environment-fix' into 'master' Kamil Trzciński
changes environment.last_deployment to a try expression so it does not fail if e… ## What does this MR do? Fixes the call on `environment.last_deployment` to not break when `environment`is not yet set. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24779 See merge request !7671
2016-11-24Merge branch 'api-no-convert' into 'master' Rémy Coutable
Don't convert data which already is the target type With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one. See merge request !7740
2016-11-24API: Introduce `#find_project!` which also check access permissionRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master' Rémy Coutable
Move admin spam spinach test to RSpec See merge request !7708
2016-11-24Don't convert data which already is the target typeRobert Schilling
2016-11-24API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch ↵Achilleas Pipinellis
'24908-install-instructions-seem-to-have-two-database-steps-out-of-order' into 'master' Fix documentation to create the `pg_trm` extension before creating the DB Closes #24908 See merge request !7735
2016-11-24Stop supporting Google and Azure as backup strategiesRémy Coutable
The amount of gems required is quite high compared to the usefulness of the features. Related to !4928, !6713 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch 'master' into 'master' Achilleas Pipinellis
Add missing documentation. ## What does this MR do? Add documentation to Build events on webhooks See merge request !7717
2016-11-24renames some of the specs and adds changelog entrytiagonbotelho
2016-11-24Merge branch 'update-project-api-doc' into 'master' Sean McGivern
Add default_branch attr to Project API payload in docs. See merge request !7726
2016-11-24Merge branch 'master' into autocomplete-space-prefixPhil Hughes
2016-11-24Merge branch 'improve-testing-styleguide' into 'master' Robert Speicher
Document that we always use `do...end` for `before` in RSpec [ci skip] See merge request !7697
2016-11-24Merge branch 'docs/jira-add-missing-file' into 'master' Achilleas Pipinellis
Add missing JIRA file that redirects to the new location See merge request !7736
2016-11-24Fixed dragging issue moving wrong issue after multiple drags of issuePhil Hughes
2016-11-24Fixed issue boards issue sorting when dragging issue into listPhil Hughes
Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom.
2016-11-24Rephrase some system notes to be compatible with new system note styleDouwe Maan
2016-11-24Add missing JIRA file that redirects to the new locationAchilleas Pipinellis
[ci skip]
2016-11-24Fix documentation to create the `pg_trm` extension before creating the DBRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Document that we always use `do...end` for `before` in RSpecRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Make API::Helpers find a project with only one queryRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-24Merge branch 'backport-commands-params' into 'master' Douwe Maan
Backport Note#commands_changes from EE One small thing from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870 that was missed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7604. /cc @rdavila See merge request !7730
2016-11-24Merge branch 'mrchrisw/add-namespace-logging' into 'master' Robert Speicher
Log mv_namespace parameters [ci skip] See merge request !7729
2016-11-24Backport Note#commands_changes from EEDouwe Maan
2016-11-24Log mv_namespace parametersChris Wilson
2016-11-24Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan
Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459