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 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-234-6/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reprocessing skipped jobs when retrying pipeline See merge request !9436
| * | | | | | Fix Rubocop offense in OptimisticLocking modulefix/gb/pipeline-retry-skipped-jobsGrzegorz Bizon2017-02-231-1/+1
| | | | | | |
| * | | | | | Add basic specs for optimistic locking mixinGrzegorz Bizon2017-02-231-3/+16
| | | | | | |
| * | | | | | Process skipped jobs in the pipeline when retrying itGrzegorz Bizon2017-02-232-11/+12
| | | | | | |
| * | | | | | Reprocess jobs in stages once when retrying pipelineGrzegorz Bizon2017-02-221-5/+10
| | | | | | |
| * | | | | | Fix reprocessing skipped jobs when retrying pipelineGrzegorz Bizon2017-02-222-2/+25
| | | | | | |
* | | | | | | Merge branch 'api-remove-attributes_for_keys' into 'master' Rémy Coutable2017-02-232-8/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grape validation in the members API. See merge request !9471
| * | | | | | | Use grape to validate parameters in the members APIapi-remove-attributes_for_keysRobert Schilling2017-02-232-8/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'api-subscribe-doc' into 'master' Rémy Coutable2017-02-233-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use POST in the endpoint description for :resource/unsubscribe See merge request !9469
| * | | | | | | Use POST in the endpoint description for :ressource/unsubscribe [ci skip]api-subscribe-docRobert Schilling2017-02-233-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'pages-0.3.2' into 'master' Robert Speicher2017-02-232-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pages 0.3.2 See merge request !9474
| * | | | | | | | Upgrade GitLab Pages to v0.3.2Nick Thomas2017-02-232-1/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-mr-size-with-over-100-files' into 'master' Sean McGivern2017-02-233-1/+53
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR changes tab size count Closes #27563 See merge request !9091
| * | | | | | | Fix MR changes tab size countfix-mr-size-with-over-100-filesSean McGivern2017-02-233-1/+53
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was wrong when there were over 100 files in the diff, because we did not use the same diff options as subclasses of `Gitlab::Diff::FileCollection::Base` when getting the raw diffs. (The reason we don't use those classes directly is because they may perform highlighting, which isn't needed for just counting the diffs.)
* | | | | | | 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
View Lorry Controller Status