summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixed failing specsph-ajax-to-axiosPhil Hughes2018-01-302-2/+2
|
* potential fix for tests crashingPhil Hughes2018-01-301-2/+3
| | | | use underscore noop instead of jquery
* EE backport for callback being optionalPhil Hughes2018-01-301-1/+1
|
* more EE backportsPhil Hughes2018-01-301-2/+10
|
* backported changed from EEPhil Hughes2018-01-301-1/+5
|
* fixed failing IDE testPhil Hughes2018-01-301-1/+1
|
* fixed more unhandled promise rejectionsPhil Hughes2018-01-302-5/+13
|
* fixed unhandled promise rejectionPhil Hughes2018-01-301-2/+4
|
* changed commits.js to axiosPhil Hughes2018-01-302-28/+49
|
* converted blob viewer to axiosPhil Hughes2018-01-302-33/+25
|
* spec fixes after API axios changePhil Hughes2018-01-303-11/+19
|
* Converted API.js to axiosPhil Hughes2018-01-305-200/+102
|
* 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
| * | Remove tap and use simplified method callOswaldo Ferreira2018-01-291-1/+2
| | |
| * | Return more consistent values for merge_status on MR APIosw-consistent-values-on-api-merge-statusOswaldo Ferreira2018-01-283-1/+15
| | |
* | | Merge branch 'axios-post-edit-blob' into 'master'Filipa Lacerda2018-01-292-8/+29
|\ \ \ | | | | | | | | | | | | | | | | Replace $.post in edit blob with axios See merge request gitlab-org/gitlab-ce!16693
| * | | Replace $.post in edit blob with axiosClement Ho2018-01-292-8/+29
|/ / /
* | | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-293-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
| * \ \ Merge branch 'master' into fix-cache-clear-windowsfix-cache-clear-windowsMatija Čupić2018-01-2715-165/+242
| |\ \ \
| * | | | Add CHANGELOG entryMatija Čupić2018-01-261-0/+5
| | | | |
| * | | | Replace : with _ in cache key versioningMatija Čupić2018-01-262-2/+2
| | | | |
* | | | | Merge branch '42553-fix-commit-spec' into 'master'Rémy Coutable2018-01-291-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Intermittent spec failure in spec/models/commit_spec.rb" Closes #42553 See merge request gitlab-org/gitlab-ce!16768
| * | | | | Fix an order dependency in a specNick Thomas2018-01-291-3/+3
|/ / / / /
* | | | | Merge branch 'osw-fix-lost-diffs-when-source-branch-deleted' into 'master'Rémy Coutable2018-01-294-5/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close and do not reload MR diffs when source branch is deleted Closes #37775 See merge request gitlab-org/gitlab-ce!16690
| * | | | | Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-294-5/+43
|/ / / / /
* | | | | Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-294-251/+290
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move mr_widget_merged into a vue file Closes #42486 See merge request gitlab-org/gitlab-ce!16746
| * | | | | Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
| | | | | |
| * | | | | [ci skip] Merge branch 'master' into fl-vue-mr-widgetFilipa Lacerda2018-01-2939-395/+500
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) normalize headers correctly i18n flash message fixed dashboard projects not being filterable Converted filterable_list to axios Converted due_date_select to axios Converted dropzone_input to axios Converted create_merge_request_dropdown to axios converted compare_autocomplete to axios Convered compare.js to axios Set alternate object directories in run_git Digital Ocean Spaces now supports AWS v4 streaming API Fix spec failures in issues_spec.rb Fix #42486. Generalize toggle_buttons.js update code based on feedback add changelog fix spec add spec disable retry attempts for Import/Export until that is fixed add an extra spec fix validation error on services ...
| * | | | | | Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-264-251/+290
| | | | | | |
* | | | | | | Merge branch 'limit-never-zero' into 'master'Robert Speicher2018-01-296-26/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow Repository#log with limit zero See merge request gitlab-org/gitlab-ce!16674
| * | | | | | | Don't allow Repository#log with limit zeroJacob Vosmaer (GitLab)2018-01-296-26/+40
|/ / / / / / /
View Lorry Controller Status