summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-294-3/+23
* Merge branch '41972-make-sure-no-warnings' into 'master'Robert Speicher2018-01-2929-106/+332
|\
| * 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
| * Fix rubocop offenses. It's not checked before whenLin Jen-Shin2018-01-262-5/+8
| * 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
| * Ignore flay warningsLin Jen-Shin2018-01-261-1/+1
| * Avoid loading rspec-parameterized to avoid warningsLin Jen-Shin2018-01-261-1/+1
| * Don't print stdout in case we're just printing warningsLin Jen-Shin2018-01-261-1/+0
| * 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
* | Merge branch 'osw-consistent-values-on-api-merge-status' into 'master'Douwe Maan2018-01-293-1/+16
|\ \
| * | 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 axiosClement Ho2018-01-292-8/+29
|/ / /
* | | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-293-2/+7
|\ \ \
| * \ \ 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
|\ \ \ \ \
| * | | | | 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 deletedOswaldo Ferreira2018-01-294-5/+43
|/ / / / /
* | | | | Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-294-251/+290
|\ \ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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 zeroJacob Vosmaer (GitLab)2018-01-296-26/+40
|/ / / / / / /
* | | | | | | Merge branch '42521-docs-update-usage-of-force-option-when-running-the-restor...Achilleas Pipinellis2018-01-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Updating docs for usage of force=yes when performing a restore.42521-docs-update-usage-of-force-option-when-running-the-restore-raketaskastrachan2018-01-291-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'qa/mk-fix-unable-to-click-new-project-in-dropdown' into 'master'Rémy Coutable2018-01-291-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix intermittently failed click in dropdownqa/mk-fix-unable-to-click-new-project-in-dropdownMichael Kozono2018-01-263-11/+25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'qa/mk-fix-intermittent-clone-failure' into 'master'Rémy Coutable2018-01-291-6/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix intermittent clone over SSH failureqa/mk-fix-intermittent-clone-failureMichael Kozono2018-01-263-15/+22
| |/ / / / / /
* | | | | | | Merge branch 'nogravatar-fix-default-avatar' into 'master'Fatih Acet2018-01-295-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entry for !16681Felix Geyer2018-01-281-0/+5
| * | | | | | | Fall back to default_avatar_url in issue assigment.Felix Geyer2018-01-282-5/+3
| * | | | | | | Make default_avatar return a full path.Felix Geyer2018-01-282-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'qa_78_create_merge_request' into 'master'Grzegorz Bizon2018-01-2912-9/+137
|\ \ \ \ \ \ \
| * | | | | | | Create merge request specqa_78_create_merge_requestFelipe Artur2018-01-2612-9/+137
* | | | | | | | Merge branch 'qa/mk-fix-element-is-not-clickable-at-point' into 'master'Grzegorz Bizon2018-01-293-10/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix intermittent click errorqa/mk-fix-element-is-not-clickable-at-pointMichael Kozono2018-01-263-10/+19
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'qa/mk-fix-new-project-namespace' into 'master'Grzegorz Bizon2018-01-291-2/+2
|\ \ \ \ \ \ \ \