summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'qa-define-selectors'qa-define-selectorsLin Jen-Shin2018-01-3086-661/+1351
|\ | | | | | | # Conflicts: # qa/qa/page/group/show.rb
| * Merge branch 'rc/port-ee-4064' into 'master'Rémy Coutable2018-01-3011-7/+190
| |\ | | | | | | | | | | | | Port changes from gitlab-org/gitlab-ee!4064 to CE See merge request gitlab-org/gitlab-ce!16796
| | * Port changes from gitlab-org/gitlab-ee!4064 to CERémy Coutable2018-01-3011-7/+190
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge branch '42569-lint-changelog-yaml-script-is-run-twice-in-ci' into 'master'Grzegorz Bizon2018-01-301-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job Closes #42569 See merge request gitlab-org/gitlab-ce!16790
| | * | Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in ↵42569-lint-changelog-yaml-script-is-run-twice-in-ciRémy Coutable2018-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | the 'docs lint' job Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-308-143/+180
| |\ \ \ | | | | | | | | | | | | | | | | | | | | More $.ajax conversions to axios See merge request gitlab-org/gitlab-ce!16761
| | * | | cache jQuery selectorph-ajax-into-axiosPhil Hughes2018-01-301-5/+7
| | | | |
| | * | | fixed issuable_spec.jsPhil Hughes2018-01-291-4/+22
| | | | |
| | * | | Converted integration_settings_form to axiosPhil Hughes2018-01-292-75/+101
| | | | |
| | * | | Converted issuable_bulk_update_actions to axiosPhil Hughes2018-01-291-9/+4
| | | | |
| | * | | Converted issuable_index to axiosPhil Hughes2018-01-291-13/+15
| | | | |
| | * | | Converted group_label_subscription to axiosPhil Hughes2018-01-291-14/+13
| | | | |
| | * | | Converted graphs_show to axiosPhil Hughes2018-01-291-7/+9
| | | | |
| | * | | Converted gl_dropdown to axiosPhil Hughes2018-01-291-19/+12
| | | | |
| * | | | Merge branch 'update-create-item-dropdown-with-create-new-item-option' into ↵Filipa Lacerda2018-01-302-44/+139
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown` See merge request gitlab-org/gitlab-ce!16699
| | * | | Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-optionEric Eastwood2018-01-302-44/+139
| | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
| * | | | Merge branch 'axios-get-single-file-diff' into 'master'Filipa Lacerda2018-01-302-18/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace $.get in single file diff with axios See merge request gitlab-org/gitlab-ce!16696
| | * | | | Replace $.get in single file diff with axiosClement Ho2018-01-302-18/+15
| |/ / / /
| * | | | Merge branch 'axios-post-label-manager' into 'master'Fatih Acet2018-01-301-18/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace $.post in label manager with axios See merge request gitlab-org/gitlab-ce!16695
| | * | | | Remove unnecessary returnaxios-post-label-managerClement Ho2018-01-241-1/+1
| | | | | |
| | * | | | Replace $.post in label manager with axiosClement Ho2018-01-241-18/+14
| | | | | |
| * | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-301-11/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: Correct example responses in repository_files.md See merge request gitlab-org/gitlab-ce!16754
| | * | | | | doc: Correct example responses in repository_files.mdkasbah2018-01-271-11/+2
| | | | | | |
| * | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-301-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Update index.md See merge request gitlab-org/gitlab-ce!16733
| | * | | | | Update index.mdMuhamed2018-01-261-1/+1
| | | | | | |
| * | | | | | Merge branch 'grape-router-helpers-bugfix' into 'master'Rémy Coutable2018-01-302-0/+30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix grape-route-helper route shadowing See merge request gitlab-org/gitlab-ce!16781
| | * | | | | | Fix grape-route-helper route shadowinggrape-router-helpers-bugfixMario de la Ossa2018-01-292-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a monkey patch since the grape-route-helpers project seems to be abandoned
| * | | | | | | Merge branch '41802-add-space-to-edit-delete-tag-btns' into 'master'Filipa Lacerda2018-01-302-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Missing space between edit and delete buttons in tag list" Closes #41802 See merge request gitlab-org/gitlab-ce!16757
| | * | | | | | | Adds spacing between edit and delete btn in tag listJacopo2018-01-282-1/+6
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Update CHANGELOG.md for 10.4.2Mark Fletcher2018-01-307-31/+16
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge branch 'fix-prometheus-empty-state-no-data' into 'master'Phil Hughes2018-01-302-3/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add noData empty state to Prometheus graphs Closes #42558 See merge request gitlab-org/gitlab-ce!16777
| | * | | | | | | add noData empty state to prometheus graphsfix-prometheus-empty-state-no-dataMike Greiling2018-01-292-3/+16
| | | | | | | | |
| * | | | | | | | Merge branch 'sh-fix-jira-trailing-slash' into 'master'Robert Speicher2018-01-303-1/+29
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix JIRA not working when a trailing slash is included Closes #42494 See merge request gitlab-org/gitlab-ce!16748
| | * | | | | | | | Fix JIRA not working when a trailing slash is includedStan Hu2018-01-293-1/+29
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaving a trailing slash in the context option causes the jira-ruby gem to add an extra slash in HTTP requests to the URL, preventing JIRA from working properly. Closes #42494
| * | | | | | | | Merge branch '41972-make-sure-no-warnings' into 'master'Robert Speicher2018-01-2929-106/+332
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail static-analysis if there's output to stderr Closes #41972 See merge request gitlab-org/gitlab-ce!16648
| | * | | | | | | | Update gitlab-styles and update .rubocop.yml41972-make-sure-no-warningsLin Jen-Shin2018-01-262-5/+1
| | | | | | | | | |
| | * | | | | | | | Remove bin/upgrade.rb as we don't seem to refer itLin Jen-Shin2018-01-261-3/+0
| | | | | | | | | |
| | * | | | | | | | Use Process::Status rather than an integerLin Jen-Shin2018-01-265-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However keep backward compatibility
| | * | | | | | | | Fix rubocop offenses. It's not checked before whenLin Jen-Shin2018-01-262-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's inside lib/tasks/*
| | * | | | | | | | Eliminate the last warning for redis wrapperLin Jen-Shin2018-01-262-1/+2
| | | | | | | | | |
| | * | | | | | | | We need Rails in order to use Gitlab.config anywayLin Jen-Shin2018-01-262-4/+1
| | | | | | | | | |
| | * | | | | | | | Eliminate the warnings for databaseLin Jen-Shin2018-01-261-11/+9
| | | | | | | | | |
| | * | | | | | | | Eliminate the warnings from task helpersLin Jen-Shin2018-01-2613-54/+45
| | | | | | | | | |
| | * | | | | | | | Convert parser warnings to stdout in haml_lintLin Jen-Shin2018-01-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we ignore it in static-analysis when status is 0, yet still report it if it's not.
| | * | | | | | | | Ignore flay warningsLin Jen-Shin2018-01-261-1/+1
| | | | | | | | | |
| | * | | | | | | | Avoid loading rspec-parameterized to avoid warningsLin Jen-Shin2018-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for parser which is emitting: ``` warning: parser/current is loading parser/ruby23, which recognizes warning: 2.3.5-compliant syntax, but you are running 2.3.6. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri. ``` There's no easy way to disable this, and we're already using the latest version. This should be harmless anyway.
| | * | | | | | | | Don't print stdout in case we're just printing warningsLin Jen-Shin2018-01-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it could be confusing
| | * | | | | | | | Generate secret first to avoid warnings laterLin Jen-Shin2018-01-261-0/+1
| | | | | | | | | |
| | * | | | | | | | Fail static-analysis if there's output to stderrLin Jen-Shin2018-01-266-24/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: fix offenders
| * | | | | | | | | Merge branch 'osw-consistent-values-on-api-merge-status' into 'master'Douwe Maan2018-01-293-1/+16
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return more consistent values for merge_status on MR API Closes #20639 See merge request gitlab-org/gitlab-ce!16708
View Lorry Controller Status