summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable Performance/RedundantMergeDouwe Maan2017-02-2314-24/+20
* Disable some more copsDouwe Maan2017-02-232-104/+42
* Disable a few RSpec copsDouwe Maan2017-02-232-63/+27
* Custom cops don’t need to be mentioned in .rubocop.ymlDouwe Maan2017-02-231-6/+0
* Disable Lint/UnusedMethodArgumentDouwe Maan2017-02-232-6/+3
* Disable Style/TrailingCommaInLiteralDouwe Maan2017-02-232-7/+3
* Enable Style/SpaceInsideBracketsDouwe Maan2017-02-2333-77/+75
* Enable Style/MutableConstantDouwe Maan2017-02-23118-192/+190
* Enable Style/DotPositionDouwe Maan2017-02-23188-871/+868
* Update .rubocop_todo.ymlDouwe Maan2017-02-231-128/+445
* Merge branch 'cs-upgrade-licensee' into 'master' 27950-check-ci-statusRémy Coutable2017-02-236-18/+18
|\
| * Update Licensee from 8.0.0 to 8.7.0.cs-upgrade-licenseeConnor Shea2017-02-226-18/+18
* | Merge branch '26900-pipelines-tabs' into 'master' Kamil Trzciński2017-02-238-25/+102
|\ \
| * | Adds missing tests for all status accepted in scopeFilipa Lacerda2017-02-232-16/+28
| * | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-23856-4741/+10013
| |\ \
| * | | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-168-12/+77
* | | | Merge branch 'api-remove-merge-request-endpoint' into 'master' Sean McGivern2017-02-231-1/+0
|\ \ \ \
| * | | | Remove last merge_request endpointRobert Schilling2017-02-231-1/+0
* | | | | Merge branch 'fix-test-for-build-attributes' into 'master' Kamil Trzciński2017-02-232-5/+6
|\ \ \ \ \
| * | | | | We actually want to clone project and remove gl_project_idfix-test-for-build-attributesLin Jen-Shin2017-02-211-2/+2
| * | | | | Fix build attributes test, see:Lin Jen-Shin2017-02-212-5/+6
* | | | | | Merge branch '26570-optimize-latest-pipeline-query' into 'master' Kamil Trzciński2017-02-234-4/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add index for ci_commits for gl_project_id, ref, status26570-optimize-latest-pipeline-queryLin Jen-Shin2017-02-203-2/+20
| * | | | | Consider the case where we don't specify ref for pipelineLin Jen-Shin2017-02-201-3/+5
| * | | | | Optimize Ci::Pipeline.latest queryLin Jen-Shin2017-02-201-0/+1
* | | | | | Merge branch 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-2313-24/+723
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-22222-1125/+898
| |\ \ \ \ \ \
| * | | | | | | Remove deprecated `upvotes` and `downvotes` from the notes APIRobert Schilling2017-02-2213-25/+723
* | | | | | | | Merge branch '26875-builds-api-endpoint-skipped-scope' into 'master' Rémy Coutable2017-02-233-1/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Rebase to master for avoiding failing testsGeorge Andrinopoulos2017-02-233-1/+19
|/ / / / / / /
* | | | | | | Merge branch '28495-content-shifting' into 'master' Filipa Lacerda2017-02-231-10/+6
|\ \ \ \ \ \ \
| * | | | | | | Keep right padding the same whether sidebar is open or not28495-content-shiftingAnnabel Dunstone Gray2017-02-211-10/+6
* | | | | | | | Merge branch '26348-cleanup-navigation-order-groups' into 'master' Alfredo Sumaran2017-02-2311-22/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Code style improvementsAlfredo Sumaran2017-02-2311-22/+52
|/ / / / / / / /
* | | | | | | | Merge branch 'remove-require-context-filtered-search-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | remove require.context from filtered_search_bundleremove-require-context-filtered-search-bundleMike Greiling2017-02-221-3/+9
* | | | | | | | | Merge branch 'remove-require-context-graphs-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove require.context from graphs_bundleremove-require-context-graphs-bundleMike Greiling2017-02-221-3/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'remove-require-context-network-bundle' into 'master' Alfredo Sumaran2017-02-231-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove require.context from network_bundleremove-require-context-network-bundleMike Greiling2017-02-221-3/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into 'm...Robert Speicher2017-02-222-43/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | updated ci skip regex to accept underscores and hyphensupdate-ci-skip-regex-to-accept-underscores-and-hyphensLuke "Jared" Bennett2017-02-222-43/+31
* | | | | | | | | Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'mas...Robert Speicher2017-02-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
* | | | | | | | | | Merge branch 'ignore-rails-cves' into 'master' Robert Speicher2017-02-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ignore two Rails CVEs in bundler:audit jobDouwe Maan2017-02-221-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '22466-task-list-alignment' into 'master' Annabel Dunstone Gray2017-02-224-11/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Position task list checkbox to match the list indentJared Deckard2017-02-104-11/+35
* | | | | | | | | | | Merge branch 'add-issues-tooltip' into 'master' Alfredo Sumaran2017-02-224-5/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added testsadd-issues-tooltipPhil Hughes2017-02-212-2/+8