Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'ide-markdown-temp-file-fix' into 'master' | Tim Zallmann | 2018-04-11 | 3 | -12/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | correctly dispose editor instance in specs | Phil Hughes | 2018-04-10 | 1 | -1/+1 | |
| * | | | | | | | | | | fixed mock URL that was causing request to fail | Phil Hughes | 2018-04-10 | 1 | -1/+1 | |
| * | | | | | | | | | | Fixed markdown preview in IDE not working for new files | Phil Hughes | 2018-04-10 | 3 | -11/+49 | |
* | | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-application-settings-controller' into 'ma... | Douwe Maan | 2018-04-11 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | [Rails5] Fix admin/application_settings_controller | blackst0ne | 2018-04-11 | 1 | -0/+2 | |
* | | | | | | | | | | | Merge branch 'mk/backport-email-handler-spec-fix' into 'master' | Stan Hu | 2018-04-11 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix email handler spec for EE | Michael Kozono | 2018-04-10 | 1 | -2/+8 | |
* | | | | | | | | | | | Merge branch 'zj-fix-environments-fixtures' into 'master' | Robert Speicher | 2018-04-11 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix enviroments seeding on certain branch names | Zeger-Jan van de Weg | 2018-04-10 | 1 | -1/+5 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'update_vendored_gitlab_ci_yml_for_auto_devops' into 'master' | Robert Speicher | 2018-04-10 | 1 | -11/+42 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Update vendored .gitlab-ci.yml for Auto-Devops | Olivier Gonzalez | 2018-04-10 | 1 | -11/+42 | |
* | | | | | | | | | | Merge branch '40487-update-vue-resource-stage' into 'master' | Phil Hughes | 2018-04-10 | 2 | -68/+35 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update state request from vue resource to axios | Filipa Lacerda | 2018-04-10 | 2 | -68/+35 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'dm-seed-admin' into 'master' | Sean McGivern | 2018-04-10 | 1 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Make sure hooks run when seeding admin user | Douwe Maan | 2018-04-10 | 1 | -10/+10 | |
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-spinach' into 'master' | Rémy Coutable | 2018-04-10 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [Rails5] Fix running spinach tests | blackst0ne | 2018-04-10 | 2 | -1/+10 | |
* | | | | | | | | | | Merge branch 'ab-37125-assigned-issues-query' into 'master' | Yorick Peterse | 2018-04-10 | 2 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Reduce complexity of issuable finder query.ab-37125-assigned-issues-query | Andreas Brandl | 2018-04-09 | 2 | -4/+12 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '42770_setup_security_products' into 'master' | Dmitriy Zaporozhets | 2018-04-10 | 1 | -4/+38 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update Security Products jobs definitions | Olivier Gonzalez | 2018-04-10 | 1 | -4/+38 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'revert-e9e800f5' into 'master' | Marin Jankovski | 2018-04-10 | 4 | -104/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'" | Kamil Trzciński | 2018-04-10 | 4 | -104/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch '40487-axios-pipelines' into 'master' | Phil Hughes | 2018-04-10 | 6 | -267/+172 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Replace vue resources with axios for pipelines table | Filipa Lacerda | 2018-04-09 | 6 | -267/+172 | |
* | | | | | | | | | Merge branch 'docs-gitaly-for-new-git-features' into 'master' | Sean McGivern | 2018-04-10 | 1 | -4/+69 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Document process for new Git features | Jacob Vosmaer (GitLab) | 2018-04-10 | 1 | -4/+69 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'gitaly-0.95.0' into 'master' | Sean McGivern | 2018-04-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use Gitaly 0.95.0gitaly-0.95.0 | Jacob Vosmaer | 2018-04-09 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'deploy-tokens-container-registry-specs' into 'master' | Kamil Trzciński | 2018-04-10 | 5 | -12/+165 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Verify that deploy token has valid access when pulling container registry image | Mayra Cabrera | 2018-04-10 | 5 | -12/+165 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'port-features-project-project-to-rspec' into 'master' | Robert Speicher | 2018-04-10 | 69 | -1467/+1173 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Address review feedback | Rémy Coutable | 2018-04-09 | 20 | -101/+57 | |
| * | | | | | | | | Migrate features/project/project.feature to RSpec and reorganize several Proj... | Rémy Coutable | 2018-04-09 | 68 | -1411/+1161 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Update CHANGELOG.md for 10.6.4 | Mayra Cabrera | 2018-04-09 | 10 | -45/+18 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'feature/add_target_to_tags' into 'master' | Robert Speicher | 2018-04-09 | 4 | -1/+13 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Expose the target commit ID through the tag API | Andrew Beresford | 2018-04-08 | 4 | -1/+13 | |
* | | | | | | | | Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipient... | Yorick Peterse | 2018-04-09 | 22 | -50/+188 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipients | Sean McGivern | 2018-04-09 | 12 | -29/+149 | |
| * | | | | | | | | Use Goldiloader for handling N+1 queries | Yorick Peterse | 2018-04-09 | 12 | -21/+39 | |
* | | | | | | | | | Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master' | Rémy Coutable | 2018-04-09 | 5 | -7/+22 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Bump ruby 2.3.6 cache key and source installation docssh-bump-ruby-and-git-image-ci | Stan Hu | 2018-04-09 | 2 | -5/+6 | |
| * | | | | | | | | | Bump .ruby-version from 2.3.6 to 2.3.7 | Stan Hu | 2018-04-09 | 1 | -1/+1 | |
| * | | | | | | | | | Work around Ruby 2.3.7 bug by defining prepended class methods needed for tests | Stan Hu | 2018-04-09 | 2 | -0/+14 | |
| * | | | | | | | | | Bump Ruby to 2.3.7 and git to 2.17.0 in CI image | Stan Hu | 2018-04-07 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch '44296-commit-path' into 'master' | Phil Hughes | 2018-04-09 | 3 | -49/+104 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Checks if commit information exists before trying to render it44296-commit-path | Filipa Lacerda | 2018-04-06 | 3 | -49/+104 | |
* | | | | | | | | | | | Merge branch 'gitlab-shell-7.1.2' into 'master' | Douwe Maan | 2018-04-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use gitlab-shell 7.1.2gitlab-shell-7.1.2 | Jacob Vosmaer | 2018-04-09 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | |