summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'ide-markdown-temp-file-fix' into 'master'Tim Zallmann2018-04-113-12/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | correctly dispose editor instance in specsPhil Hughes2018-04-101-1/+1
| * | | | | | | | | | fixed mock URL that was causing request to failPhil Hughes2018-04-101-1/+1
| * | | | | | | | | | Fixed markdown preview in IDE not working for new filesPhil Hughes2018-04-103-11/+49
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-application-settings-controller' into 'ma...Douwe Maan2018-04-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [Rails5] Fix admin/application_settings_controllerblackst0ne2018-04-111-0/+2
* | | | | | | | | | | Merge branch 'mk/backport-email-handler-spec-fix' into 'master'Stan Hu2018-04-111-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix email handler spec for EEMichael Kozono2018-04-101-2/+8
* | | | | | | | | | | Merge branch 'zj-fix-environments-fixtures' into 'master'Robert Speicher2018-04-111-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix enviroments seeding on certain branch namesZeger-Jan van de Weg2018-04-101-1/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'update_vendored_gitlab_ci_yml_for_auto_devops' into 'master'Robert Speicher2018-04-101-11/+42
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Update vendored .gitlab-ci.yml for Auto-DevopsOlivier Gonzalez2018-04-101-11/+42
* | | | | | | | | | Merge branch '40487-update-vue-resource-stage' into 'master'Phil Hughes2018-04-102-68/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update state request from vue resource to axiosFilipa Lacerda2018-04-102-68/+35
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dm-seed-admin' into 'master'Sean McGivern2018-04-101-10/+10
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make sure hooks run when seeding admin userDouwe Maan2018-04-101-10/+10
* | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-spinach' into 'master'Rémy Coutable2018-04-102-1/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | [Rails5] Fix running spinach testsblackst0ne2018-04-102-1/+10
* | | | | | | | | | Merge branch 'ab-37125-assigned-issues-query' into 'master'Yorick Peterse2018-04-102-4/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Reduce complexity of issuable finder query.ab-37125-assigned-issues-queryAndreas Brandl2018-04-092-4/+12
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '42770_setup_security_products' into 'master'Dmitriy Zaporozhets2018-04-101-4/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Security Products jobs definitionsOlivier Gonzalez2018-04-101-4/+38
|/ / / / / / / / /
* | | | | | | | | Merge branch 'revert-e9e800f5' into 'master'Marin Jankovski2018-04-104-104/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"Kamil Trzciński2018-04-104-104/+4
|/ / / / / / / /
* | | | | | | | Merge branch '40487-axios-pipelines' into 'master'Phil Hughes2018-04-106-267/+172
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace vue resources with axios for pipelines tableFilipa Lacerda2018-04-096-267/+172
* | | | | | | | | Merge branch 'docs-gitaly-for-new-git-features' into 'master'Sean McGivern2018-04-101-4/+69
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Document process for new Git featuresJacob Vosmaer (GitLab)2018-04-101-4/+69
|/ / / / / / / /
* | | | | | | | Merge branch 'gitaly-0.95.0' into 'master'Sean McGivern2018-04-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Gitaly 0.95.0gitaly-0.95.0Jacob Vosmaer2018-04-091-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'deploy-tokens-container-registry-specs' into 'master'Kamil Trzciński2018-04-105-12/+165
|\ \ \ \ \ \ \ \
| * | | | | | | | Verify that deploy token has valid access when pulling container registry imageMayra Cabrera2018-04-105-12/+165
|/ / / / / / / /
* | | | | | | | Merge branch 'port-features-project-project-to-rspec' into 'master'Robert Speicher2018-04-1069-1467/+1173
|\ \ \ \ \ \ \ \
| * | | | | | | | Address review feedbackRémy Coutable2018-04-0920-101/+57
| * | | | | | | | Migrate features/project/project.feature to RSpec and reorganize several Proj...Rémy Coutable2018-04-0968-1411/+1161
|/ / / / / / / /
* | | | | | | | Update CHANGELOG.md for 10.6.4Mayra Cabrera2018-04-0910-45/+18
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'feature/add_target_to_tags' into 'master'Robert Speicher2018-04-094-1/+13
|\ \ \ \ \ \ \
| * | | | | | | Expose the target commit ID through the tag APIAndrew Beresford2018-04-084-1/+13
* | | | | | | | Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipient...Yorick Peterse2018-04-0922-50/+188
|\ \ \ \ \ \ \ \
| * | | | | | | | Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipientsSean McGivern2018-04-0912-29/+149
| * | | | | | | | Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-0912-21/+39
* | | | | | | | | Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master'Rémy Coutable2018-04-095-7/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump ruby 2.3.6 cache key and source installation docssh-bump-ruby-and-git-image-ciStan Hu2018-04-092-5/+6
| * | | | | | | | | Bump .ruby-version from 2.3.6 to 2.3.7Stan Hu2018-04-091-1/+1
| * | | | | | | | | Work around Ruby 2.3.7 bug by defining prepended class methods needed for testsStan Hu2018-04-092-0/+14
| * | | | | | | | | Bump Ruby to 2.3.7 and git to 2.17.0 in CI imageStan Hu2018-04-071-1/+1
* | | | | | | | | | Merge branch '44296-commit-path' into 'master'Phil Hughes2018-04-093-49/+104
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-063-49/+104
* | | | | | | | | | | Merge branch 'gitlab-shell-7.1.2' into 'master'Douwe Maan2018-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use gitlab-shell 7.1.2gitlab-shell-7.1.2Jacob Vosmaer2018-04-091-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |