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-06-15Merge branch 'issuable-sidebar-dropdown-deselect-fix' into 'master' Jacob Schatz
Fixed issue with de-selecting dropdown option in issue sidebar ## What does this MR do? When de-selecting either an assignee or milestone, we try to send `undefined` which jQuery removes from the request causing a routing error. Instead this MR sends `null` which jQuery still sends and then correctly removes either the milestone or assignee. ## What are the relevant issue numbers? Closes #18641 ## Screenshots (if relevant) ![assignee](/uploads/6eaca416fb6e31eabf4c038967160c07/assignee.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4671
2016-06-15Merge branch 'environments-and-deployments' into 'master' Rémy Coutable
Add environments and deployments This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009. The current implementation is as follow: 1. We have two new tables: `environments` and `deployments`. 2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one. 3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment. 4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed) 5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment. 6. User have to create environments that he will track first. 7. User can remove environments. 8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment. 9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources. 10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`. The `.gitlab-ci.yml`: ``` deploy to production: stage: deploy script: dpl travis... environment: production ``` What needs to be done: - [x] Write initial implementation - [x] Improve implementation (@ayufan) - [x] Write tests (@ayufan) - [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack - [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill - [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan - [ ] Write user documentation (@ayufan and @markpundsack) See merge request !4605
2016-06-15Fixed issue with de-selecting dropdown option in issue sidebarPhil Hughes
Closes #18641
2016-06-15Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz
Fixed issue with move dropdown not being searchable ## What does this MR do? Adds the ability to search the project move dropdown. ## What are the relevant issue numbers? Closes #18634 ## Screenshots (if relevant) ![search](/uploads/f10a9a16b608308c1b3c66f186f57f80/search.gif) See merge request !4666
2016-06-15Added test to dropdown searchPhil Hughes
2016-06-15Make environments_spec more feature-specKamil Trzcinski
2016-06-15Merge branch '17333-u2f-only-after-authenticator' into 'master' Douwe Maan
Don't allow U2F set up unless an authenticator app is set up Closes #17333 # TODO - [ ] #17333 Authenticator should be set up before enabling U2F - [x] Implementation - [x] Fix/add tests - [x] Refactor - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/964c98a3c427cac6e3de88ddc74a9f172ee9742d/builds) to pass - [x] Assign to endboss for review - [x] Address @DouweM's comments - [x] No need for `javascript:void(0)` - [x] Add screenshots - [ ] Wait for merge # Screenshots ![Screen_Shot_2016-06-15_at_8.18.03_AM](/uploads/26531fa7f6e5d7617fd11d1779021b4f/Screen_Shot_2016-06-15_at_8.18.03_AM.png) ![Screen_Shot_2016-06-15_at_8.18.37_AM](/uploads/ceaae97a987a15d3e04dd76aa8a944bd/Screen_Shot_2016-06-15_at_8.18.37_AM.png) ![Screen_Shot_2016-06-15_at_8.18.47_AM](/uploads/394224d5fcff759d5acc3bf39a138530/Screen_Shot_2016-06-15_at_8.18.47_AM.png) See merge request !4585
2016-06-15Improve forms and specsKamil Trzcinski
2016-06-15Update `u2f_spec` to cover U2F being disabled until authenticator is set up.Timothy Andrew
2016-06-15Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu
Manually create todo for issuable ## What does this MR do? Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves. ## What are the relevant issue numbers? Closes #15045 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png) ![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png) ![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png) See merge request !4502
2016-06-14Update tests to make it work with Turbolinks approachAlfredo Sumaran
2016-06-14Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan
# Conflicts: # app/views/layouts/nav/_project.html.haml
2016-06-14Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski
# Conflicts: # db/schema.rb
2016-06-14Test environment controller specsKamil Trzcinski
2016-06-14Authorize environments controller actionsKamil Trzcinski
2016-06-14UI and copywriting improvementsRémy Coutable
+ Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14Add request access for groupsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski
2016-06-14Fix specsKamil Trzcinski
2016-06-14Todo tests and CHANGELOGPhil Hughes
2016-06-13Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski
2016-06-13Apply reviewer notes: update CHANGELOG, adjust code formattingAlexander Matyushentsev
2016-06-13Move issue rendering tests into separate contextsAlexander Matyushentsev
2016-06-13Add more information into RSS fead for issuesAlexander Matyushentsev
2016-06-13Merge branch 'fix-bulk-assign-labels' into 'master' Jacob Schatz
Fixes bulk-assign label for multiple issues not having the same labels ## What does this MR do? Fixes a bug when bulk-assigning a label to multiple issues while the label is present in on the issues on the selection. ## Screenshots (if relevant) **Before Bugfix** <img src="/uploads/ad1f290bcf3930177a3a71c69cbe5325/before-bugfix.gif" width="700"/> **After Bugfix** <img src="/uploads/1f04d6bf027806fb13ca3773febda744/bugfix.gif" width="700"/> ## Does this MR meet the acceptance criteria? - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !4602
2016-06-13Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski
2016-06-13Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable
Only show branches for revert / cherry-pick ## What does this MR do? Stop showing tags in the revert and cherry-pick select options. You can't change a tag anyway. ## Are there points in the code the reviewer needs to double check? Uncertain. ## Why was this MR needed? Showing tags doesn't make any sense and will just throw an exception if the user tries to cherry-pick or revert onto a tag. ## What are the relevant issue numbers? Fixes #18377. ## Screenshots (if relevant) On the GitLab CE repo: ![image](/uploads/9c5a6f09300a7c46d0a794bef2956992/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4596
2016-06-13Improve design based on reviewKamil Trzcinski
2016-06-13Test controllers if they allow to keep artifactsKamil Trzcinski
2016-06-13Only show branches for revert / cherry-pickSean McGivern
Tags are immutable, so we can't add a commit to either revert or cherry-pick another commit to them.
2016-06-11Fixes a bug when assigning a label to multiple issuesAlfredo Sumaran
Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
2016-06-10Fix preferences_spec testAnnabel Dunstone
2016-06-10Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz
CI build page UI update Closes #2569 See merge request !3829
2016-06-10Merge branch 'user-search-dropdown' into 'master' Jacob Schatz
Revert change to search all users ## What does this MR do? Reverts a change that allowed the user to search for all users in the author/assignee dropdown ## Are there points in the code the reviewer needs to double check? Double check it isn't still searching all users See merge request !4564
2016-06-10Merge branch 'label-filter-fix' into 'master' Jacob Schatz
Fixed issue where label filtering didnt work ## What does this MR do? The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that. ## What are the relevant issue numbers? Closes #18375 See merge request !4556
2016-06-10Updated testsPhil Hughes
2016-06-10Rename ci_commit -> pipelineRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10Improve initial implementation of the ↵Rémy Coutable
'only_allow_merge_if_build_succeeds.rb' feature Based on the feedback from reviewers. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10Allow or not merge MR with failed buildRui Anderson
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10Fixed failing testsPhil Hughes
2016-06-10CI build page UI updatePhil Hughes
Added sidebar Removed elements not present in design
2016-06-10removed tests needed for any author :poop:Phil Hughes
2016-06-09Merge branch 'due-date-field-ux-improv' into 'master' Jacob Schatz
Improved the UX of issue & milestone date picker ## What does this MR do? Improves the UX of the date picker on issue form & milestone form. ## What are the relevant issue numbers? Closes #18198 ## Screenshots (if relevant) ### Issues ![Screen_Shot_2016-06-06_at_09.28.29](/uploads/d9c192dff0d8076adc3ed6f005ea3790/Screen_Shot_2016-06-06_at_09.28.29.png) ### Project milestones ![Screen_Shot_2016-06-06_at_09.28.18](/uploads/2d03d72791c5fc6badfadb975a85af2b/Screen_Shot_2016-06-06_at_09.28.18.png) ### Group milestones ![Screen_Shot_2016-06-06_at_09.28.05](/uploads/0f28532396a16e6fd48ddea784ca28e3/Screen_Shot_2016-06-06_at_09.28.05.png) See merge request !4485
2016-06-09Fixed testsPhil Hughes
2016-06-09Change date format to be non zero padded in order to fix failing testAlfredo Sumaran
2016-06-09Add tests for dates on tooltipsAlfredo Sumaran
2016-06-09Added testsPhil Hughes
2016-06-09Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable
Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
2016-06-09Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew
- Need to pass in a `page_slug` to the filter, so it can rewrite based on the current page (all links are rewritten to the level of the app root). - The earlier `markdown_preview` endpoint was at the level of the wiki. We need to know the current page (for rewriting, as above), so this commit moves the endpoint to the level of a wiki page. - Fix all tests
2016-06-08Combine tests for internal linksAlfredo Sumaran