summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-3113-106/+555
* Merge branch 'axios-get-single-file-diff' into 'master'Filipa Lacerda2018-01-302-18/+15
|\
| * 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
|\
| * 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.mdkasbah2018-01-271-11/+2
* | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-301-1/+1
|\ \ \
| * | | 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 shadowinggrape-router-helpers-bugfixMario de la Ossa2018-01-292-0/+30
* | | | | Merge branch '41802-add-space-to-edit-delete-tag-btns' into 'master'Filipa Lacerda2018-01-302-1/+6
|\ \ \ \ \
| * | | | | 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
* | | | | Merge branch 'fix-prometheus-empty-state-no-data' into 'master'Phil Hughes2018-01-302-3/+16
|\ \ \ \ \
| * | | | | 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 includedStan Hu2018-01-293-1/+29
|/ / / / / /
* | | | | | 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
| |\ \ \ \ \ \ \