summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Create deep_merge javascript utilstash-deep-merge-utilPaul Slaughter2018-09-132-0/+129
* Merge branch 'frozen-string-app-finders-graphql' into 'master'Stan Hu2018-09-1370-0/+143
|\
| * Enable frozen string in app/graphql + app/findersgfyoung2018-09-1170-0/+143
* | Merge branch 'da-update-gitaly-server' into 'master'Robert Speicher2018-09-132-2/+2
|\ \
| * | Update Gitlay server version to 0.121.0Douglas Barbosa Alexandre2018-09-132-2/+2
|/ /
* | Merge branch 'mr-fixed-expanded-state-not-working' into 'master'Mike Greiling2018-09-133-7/+41
|\ \
| * | Fixed resolved discussions not toggling expandedPhil Hughes2018-09-133-7/+41
* | | Merge branch 'schema-update' into 'master'Yorick Peterse2018-09-131-4/+4
|\ \ \
| * | | Fix column differences in `db/schema.rb`Jan Provaznik2018-09-131-4/+4
* | | | Merge branch 'dz-fix-jupyter-spec' into 'master'Stan Hu2018-09-132-6/+2
|\ \ \ \
| * | | | Add project to jupyter cluster app factory specDmitriy Zaporozhets2018-09-132-6/+2
* | | | | Merge branch 'docs/abstraction-levels' into 'master'Robert Speicher2018-09-132-0/+183
|\ \ \ \ \
| * | | | | Resolve typos in Reusing Abstractions docRobert Speicher2018-09-131-2/+2
| * | | | | Document abstraction levels and code reuseYorick Peterse2018-09-132-0/+183
* | | | | | Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-13469-32/+3122
|\ \ \ \ \ \
| * | | | | | Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-11454-32/+1683
| * | | | | | Added RuboCop cops to enforce code reuse rulesYorick Peterse2018-09-1115-0/+1439
* | | | | | | Merge branch '49990-enable-omniauth-by-default' into 'master'Douwe Maan2018-09-135-6/+46
|\ \ \ \ \ \ \
| * | | | | | | Enable omniauth by defaultNick Thomas2018-09-135-6/+46
* | | | | | | | Merge branch '7573-show-click-to-expand-on-not-rendered-diffs' into 'master'Phil Hughes2018-09-133-1/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Display click to expand on collapsed diffsAndré Luís2018-09-133-1/+19
* | | | | | | | Merge branch '50808-choosing-initialize-repo-with-a-readme-breaks-project-cre...Phil Hughes2018-09-135-12/+41
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Resolve "Choosing “Initialize repo with a README” breaks project created ...Martin Wortschack2018-09-135-12/+41
|/ / / / / / /
* | | | | | | Merge branch 'vendor-auto-devops-gitlab-ci-fix-503-on-deploy' into 'master'Kamil Trzciński2018-09-132-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Auto devops should wait for Deployment to completeThong Kuah2018-09-132-0/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '51450-vendor-refactor-registry-login' into 'master'Kamil Trzciński2018-09-132-6/+11
|\ \ \ \ \ \ \
| * | | | | | | Created a function for logging into the registryThong Kuah2018-09-132-6/+11
| |/ / / / / /
* | | | | | | Merge branch 'rails5-route-warnings' into 'master'Grzegorz Bizon2018-09-132-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix route deprecation warnings in rails 5Jan Provaznik2018-09-122-2/+2
* | | | | | | Merge branch '42861-move-include-external-files-in-gitlab-ci-yml-from-starter...Grzegorz Bizon2018-09-1320-23/+1116
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Inline initialize_yaml_processorMatija Čupić2018-09-121-5/+1
| * | | | | | Stack rescue blocks for Gitlab::Ci::Config#initializeMatija Čupić2018-09-111-10/+8
| * | | | | | Add missing frozen string literal commentsMatija Čupić2018-09-119-0/+18
| * | | | | | Add link to CE move MRMatija Čupić2018-09-111-2/+2
| * | | | | | Fix references to ee .gitlab-ci.yml spec fixturesMatija Čupić2018-09-082-3/+3
| * | | | | | Add CHANGELOGMatija Čupić2018-09-081-0/+5
| * | | | | | Reconcile differences in spec/models/blob_viewerMatija Čupić2018-09-081-1/+1
| * | | | | | Reconcile differences in lib/gitlab/ciMatija Čupić2018-09-083-72/+219
| * | | | | | Reconcile differences in doc/ci/yamlMatija Čupić2018-09-081-141/+181
| * | | | | | Reconcile differences in lib/gitlab/ci/externalMatija Čupić2018-09-084-20/+23
| * | | | | | Reconcile differences in lib/gitlab/ci/external/fileMatija Čupić2018-09-085-43/+134
| * | | | | | Stub http request on specs intead of mocking HTTPartyMatija Čupić2018-09-074-24/+32
| * | | | | | Replace gitlab-ci.yml for .gitlab-ci.yml on yaml docMatija Čupić2018-09-071-6/+6
| * | | | | | Update yaml documentation examplesMatija Čupić2018-09-071-26/+50
| * | | | | | Address MR suggestionsMatija Čupić2018-09-0713-66/+66
| * | | | | | Update YAML include doc to make it more specificMatija Čupić2018-09-071-42/+57
| * | | | | | Improve external architectureMatija Čupić2018-09-0722-315/+445
| * | | | | | Make Repository#blob_data_at publicMatija Čupić2018-09-077-18/+132
| * | | | | | Address MR commentsMatija Čupić2018-09-078-48/+67
| * | | | | | Change ExternalFile to retrieve local file from repository instead of GitLab ...Matija Čupić2018-09-0712-52/+93