summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed typo in commit message help popoveride-highlighter-type-foxPhil Hughes2018-06-011-1/+1
* Merge branch 'fix-http-proxy' into 'master'Kamil Trzciński2018-06-012-1/+6
|\
| * Make http_io honor HTTP(S)_PROXY environment.NLR2018-06-012-1/+6
|/
* Merge branch 'reactive-caching-alive-bug' into 'master'Nick Thomas2018-06-013-0/+8
|\
| * ReactiveCaching#clear_reactive_cache! should clear the not keep the cache aliveTiago Botelho2018-06-013-0/+8
* | Merge branch '46913-appearance-uploader-fields-and-description-html-are-missi...Douwe Maan2018-06-012-37/+134
|\ \ | |/ |/|
| * Use RequestStore in CacheableAttributes.cached for greater performanceRémy Coutable2018-06-012-1/+14
| * Revert to caching the AR object in CacheableAttributesRémy Coutable2018-06-012-37/+121
* | Merge branch 'ide-list-merge-requests' into 'master'Filipa Lacerda2018-06-0112-0/+342
|\ \
| * | set is loading in success mutationPhil Hughes2018-06-011-0/+1
| * | Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-06-01481-20335/+6104
| |\ \ | | |/
| * | removed CHANGELOG as their are no user facing components in this merge requestide-list-merge-requestsPhil Hughes2018-05-301-5/+0
| * | ability to search merge requestsPhil Hughes2018-05-304-10/+39
| * | improved stored dataPhil Hughes2018-05-306-3/+45
| * | Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-05-30989-5362/+8631
| |\ \
| * | | fixed tests failing caused by rewirePhil Hughes2018-05-252-0/+4
| * | | Show merge requests in web IDEPhil Hughes2018-05-2512-0/+271
* | | | Merge branch 'backup-delete-all-use-file-join' into 'master'Sean McGivern2018-06-011-1/+1
|\ \ \ \
| * | | | Use File.join in DeleteAllRepositories testJacob Vosmaer2018-06-011-1/+1
* | | | | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'm...Kamil Trzciński2018-06-0129-300/+327
|\ \ \ \ \
| * | | | | Fix spec/models/ci/runner_spec.rb:775 destroy runner with no projects46010-add-more-validations-for-runners-and-runner-typeDylan Griffith2018-05-311-0/+1
| * | | | | Bring back deleted specsKamil Trzciński2018-05-313-5/+42
| * | | | | Fix test description in spec/requests/api/runner_spec.rbDylan Griffith2018-05-311-1/+1
| * | | | | Fix rubocop error in runner_spec.rbDylan Griffith2018-05-311-1/+1
| * | | | | Fix `static-analysis` changesKamil Trzciński2018-05-311-1/+1
| * | | | | Run `Ci::Runner#assign_to` in transactionKamil Trzciński2018-05-311-2/+9
| * | | | | Add uniqueness for RunnerNamespaceKamil Trzciński2018-05-311-0/+2
| * | | | | Ensure that we can remove degenerate runnersKamil Trzciński2018-05-311-0/+16
| * | | | | Improve Runners API validationsKamil Trzciński2018-05-312-7/+3
| * | | | | Improve runner registration APIKamil Trzciński2018-05-312-10/+14
| * | | | | Add `Ci::Runner` inverse_of'sKamil Trzciński2018-05-315-8/+8
| * | | | | Fix static analysisKamil Trzciński2018-05-311-2/+2
| * | | | | Fix traits of runners factoriesKamil Trzciński2018-05-311-0/+8
| * | | | | Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or notKamil Trzciński2018-05-315-12/+6
| * | | | | Fix specs api/runners_spec.rb, api/v3/runners_spec.rb update_build_queue_serv...Dylan Griffith2018-05-312-1/+4
| * | | | | Fix spec for User#ci_owned_runnersDylan Griffith2018-05-311-20/+17
| * | | | | Fix the conflict resolution in spec/models/ci/runner_spec.rbDylan Griffith2018-05-311-23/+7
| * | | | | Fix spec/features/runners_spec.rbDylan Griffith2018-05-311-2/+2
| * | | | | Make Ci::Runner#assign_to keep returning RunnerProjectDylan Griffith2018-05-311-1/+2
| * | | | | Fix some failuresKamil Trzciński2018-05-313-40/+9
| * | | | | Fix `register_job_service_spec` failuresKamil Trzciński2018-05-312-2/+3
| * | | | | Fix weird Rails bug that leads to `runner_id=null` in SQL queryKamil Trzciński2018-05-312-7/+3
| * | | | | Refactor validations and make runner factory by default to be instance-wide r...Kamil Trzciński2018-05-3119-140/+134
| * | | | | Fix weird Rails bug that leads to `runner_id=null` in SQL queryDylan Griffith2018-05-311-1/+3
| * | | | | Ensure we validate Runner#runner_type when persisting RunnerNamespaceDylan Griffith2018-05-312-1/+8
| * | | | | Improve runner_type validations for Ci::RunnerDylan Griffith2018-05-3110-99/+107
* | | | | | Merge branch 'gitaly-tripswitch' into 'master'Douwe Maan2018-06-0115-68/+226
|\ \ \ \ \ \
| * | | | | | Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-0115-68/+226
|/ / / / / /
* | | | | | Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-0110-35/+47
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Follow Rubocop for scripts/prune-old-flaky-specsLin Jen-Shin2018-06-011-2/+3
View Lorry Controller Status