summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix another specDouwe Maan2017-02-231-1/+1
|
* Old migration doesn’t require downtimeDouwe Maan2017-02-231-0/+2
|
* Fix code for copsDouwe Maan2017-02-2344-213/+245
|
* Fix specsDouwe Maan2017-02-235-11/+12
|
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-2332-104/+100
|
* Enable Style/ColonMethodCallDouwe Maan2017-02-2327-38/+36
|
* Disable Style/BracesAroundHashParametersDouwe Maan2017-02-232-8/+3
|
* Enable Style/BarePercentLiteralsDouwe Maan2017-02-2332-62/+59
|
* Enable Security/JSONLoadDouwe Maan2017-02-238-20/+11
|
* Enable Rails/ValidationDouwe Maan2017-02-2313-33/+19
|
* Disable Rails/OutputSafetyDouwe Maan2017-02-231-0/+3
|
* Disable Rails/DynamicFindByDouwe Maan2017-02-232-7/+3
|
* Enable Performance/RedundantMatchDouwe Maan2017-02-237-15/+8
|
* Enable Performance/RedundantBlockCallDouwe Maan2017-02-235-11/+6
|
* Disable Lint/UnneededSplatExpansionDouwe Maan2017-02-232-17/+2
|
* Enable Lint/UnifiedIntegerDouwe Maan2017-02-237-20/+14
|
* 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. See merge request !9451
| * Update Licensee from 8.0.0 to 8.7.0.cs-upgrade-licenseeConnor Shea2017-02-226-18/+18
| | | | | | | | Changelog: https://github.com/benbalter/licensee/releases
* | Merge branch '26900-pipelines-tabs' into 'master' Kamil Trzciński2017-02-238-25/+102
|\ \ | | | | | | | | | | | | | | | | | | Resolve "CI - Pipelines and Builds screens are inconsistent" Closes #26900 See merge request !9265
| * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (361 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
| * | | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-168-12/+77
| | | | | | | | | | | | | | | | Fix broken test
* | | | Merge branch 'api-remove-merge-request-endpoint' into 'master' Sean McGivern2017-02-231-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove last merge_request endpoint See merge request !9470
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix build attributes test See merge request !9409
| * | | | | We actually want to clone project and remove gl_project_idfix-test-for-build-attributesLin Jen-Shin2017-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the future. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9409#note_23859361
| * | | | | Fix build attributes test, see:Lin Jen-Shin2017-02-212-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9021#note_23782188 This is discovered by https://gitlab.com/gitlab-org/gitlab-ce/builds/10815456 I removed `gl_project_id` and this is failing. I took some look, realizing that: * `trace` is duplicated in `attributes` * `tag_list` is not included in `build.attributes` * `artifacts_expire_at` is missing in `attributes` So we need to: * Remove duplicated `trace` in `attributes` (40 -> 39) * Remove `tag_list` in `attributes` (39 -> 38) * Add `artifacts_expire_at` to `attributes` (38 -> 39) * Add `gl_project_id` to `attributes` (39 -> 40)
* | | | | | Merge branch '26570-optimize-latest-pipeline-query' into 'master' Kamil Trzciński2017-02-234-4/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize Ci::Pipeline.latest query Closes #26570 See merge request !9306
| * | | | | Add index for ci_commits for gl_project_id, ref, status26570-optimize-latest-pipeline-queryLin Jen-Shin2017-02-203-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | and remove the old one which we don't really need.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we already know which ref we want, we could filter it out first. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/issues/26570#note_23423376 Closes #26570
* | | | | | Merge branch 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-2313-24/+723
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated `upvotes` and `downvotes` from the notes API Closes #28441 See merge request !9384
| * \ \ \ \ \ Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-22222-1125/+898
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all available statuses to scope filter for project builds endpoint Closes #26875 See merge request !8971
| * | | | | | | 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 not Closes #28495 See merge request !9422
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up our navigational order - Groups See merge request !9309
| * | | | | | | | Code style improvementsAlfredo Sumaran2017-02-2311-22/+52
|/ / / / / / / /
View Lorry Controller Status