summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dm-revert-mr-8427'Douwe Maan2017-06-091-4/+1
|\
| * Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-4/+1
| |
* | Fix intermittent Spinach markdown render failure33457-features-project-source-markdown_render-feature-fails-on-masterSean McGivern2017-06-091-0/+2
|/ | | | When loading a tree with a README.md, we need to wait for the blob viewer.
* Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-083-3/+3
|\ | | | | | | | | Master security update See merge request !12025
| * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
* | fixes project_group_links spec by adding click tab eventtauriedavis2017-06-081-3/+4
|/
* Merge branch '23603-add-extra-functionality-for-the-top-right-plus-button' ↵Douwe Maan2017-06-087-7/+25
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Add extra functionality for the top right Plus Button" Closes #23603 See merge request !11632
| * Enhancing Spec's with negative casesTim Zallmann2017-06-072-136/+0
| |
| * Fix for Login Test ProblemTim Zallmann2017-06-071-0/+2
| |
| * Added additional classes for easier identifaction during testsTim Zallmann2017-06-072-19/+40
| | | | | | | | Greenfield Tests for Dropdown Menu finished
| * New ... Menu Feature TestsTim Zallmann2017-06-074-28/+113
| |
| * Fixed New Project Top Menu TestTim Zallmann2017-06-072-1/+18
| |
| * Added First Test for top right menuTim Zallmann2017-06-072-0/+17
| |
| * Check for Merge Request fixedTim Zallmann2017-06-072-2/+6
| | | | | | | | Fixed couple of spinach test
| * Externalised DropdownTim Zallmann2017-06-074-4/+10
| | | | | | | | | | | | Checks for creating new issue Styling of .dropdown-bold-header Fixed Spinach Tests to limit them to the main content area for clicking 'New Project' etc. so that they don't click the dropdown menu
| * Seperated Dropdown in new partialTim Zallmann2017-06-071-1/+3
| | | | | | | | | | Fixed different issues from discussion Fixed a Spinach Test which had now 2 New buttons
* | Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-072-3/+19
| |
* | Use data attributes instead of classClement Ho2017-06-072-4/+4
| |
* | Fix spinach testClement Ho2017-06-064-6/+8
|/
* Fix missing tooltip and ARIA labels for accessibilityKushal Pandya2017-06-061-1/+1
|
* Merge branch 'blameless' into 'master'Rémy Coutable2017-06-021-0/+1
|\ | | | | | | | | Promote blameless culture by using "annotate" instead See merge request !10378
| * Promote blameless culture by using "annotate" insteadIlya Vassilevsky2017-06-021-0/+1
| | | | | | | | User-facing changes (fast & easy win)
* | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-012-54/+42
|/
* Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-312-6/+6
|\ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-311-3/+3
| |\ | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| | * Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-316-18/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| | * \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2623-203/+95
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| | * \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-181-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
| | * | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
| * | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline editing Closes #24873 See merge request !11322
| | * | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-307-129/+12
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-2525-100/+104
| | |\ \ \ \ \
| | * | | | | | fixed spinach testsPhil Hughes2017-05-251-3/+3
| | | | | | | |
* | | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-311-1/+1
|/ / / / / / /
* | | | | | | Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-301-1/+1
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c425f366bfa84efab92b5d5e1d0721f16a2890bc, reversing changes made to 82f6c0f5ac4ed29390ed90592d2c431f3494d93f. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Replace 'starred_projects.feature' spinach test with an rspec analog23036-replace-all-spinach-tests-with-rspec-feature-testsblackst0ne2017-05-281-12/+0
| | | | | |
* | | | | | Merge branch ↵Fatih Acet2017-05-262-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558
| * | | | | | Update spinach specs to explicitly check Remove Source Branch.Bryce Johnson2017-05-232-2/+7
| | | | | | |
* | | | | | | Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistently display last push event widget See merge request !11585
| * | | | | | | Fix specdm-consistent-last-push-eventDouwe Maan2017-05-261-1/+1
| | | | | | | |
| * | | | | | | Consistently display last push event widgetDouwe Maan2017-05-251-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-2/+4
|/ / / / / /
* | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-252-112/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027
| * | | | | Implement web hooks loggingAlexander Randa2017-05-252-112/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover
* | | | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'Douwe Maan2017-05-2420-87/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use wait_for_requests for checking Vue resource and $.ajax requests [CE] Closes #31946 and #31555 See merge request !11451
| * | | | | Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requestsOswaldo Ferreira2017-05-2220-87/+85
| | |/ / / | |/| | |
* | | | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-231-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566
| * | | | | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-221-2/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-221-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505
| * | | | Fix specs32418-make-link-to-self-less-obviousAnnabel Dunstone Gray2017-05-191-1/+1
| |/ / /
View Lorry Controller Status