Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ce-3777-promote-to-epic' into 'master' | Rémy Coutable | 2018-11-12 | 16 | -411/+594 |
|\ | |||||
| * | Extract code from Issues::MoveServicece-3777-promote-to-epic | Jarka Košanová | 2018-11-12 | 16 | -411/+594 |
* | | Merge branch 'fix-tags-for-envs' into 'master' | Stan Hu | 2018-11-12 | 3 | -7/+18 |
|\ \ | |||||
| * | | Fix non-hacking way | Kamil Trzciński | 2018-11-12 | 2 | -2/+3 |
| * | | Revert "Just fix (hack) specs" | Kamil Trzciński | 2018-11-12 | 4 | -9/+9 |
| * | | Just fix (hack) specs | Kamil Trzciński | 2018-11-12 | 4 | -9/+9 |
| * | | Simplify test | Kamil Trzciński | 2018-11-12 | 1 | -14/+9 |
| * | | Do not reload self on hooks when creating deploymentfix-tags-for-envs | Kamil Trzciński | 2018-11-12 | 2 | -3/+6 |
| * | | tags test | Kamil Trzciński | 2018-11-12 | 1 | -1/+13 |
* | | | Merge branch 'sh-53180-append-path' into 'master' | Rémy Coutable | 2018-11-12 | 13 | -54/+43 |
|\ \ \ | |||||
| * | | | Make sure there's only one slash as path separatorsh-53180-append-path | Stan Hu | 2018-11-09 | 13 | -54/+43 |
* | | | | Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master' | Douwe Maan | 2018-11-12 | 2 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Fix MergeRequestService erroring out on deleted branch | Stan Hu | 2018-11-12 | 2 | -1/+5 |
* | | | | | Merge branch 'dm-disable-codeowners' into 'master' | Sean McGivern | 2018-11-12 | 1 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Disable CODEOWNERS for the time being | Douwe Maan | 2018-11-12 | 1 | -0/+0 |
| |/ / / / | |||||
* | | | | | Merge branch '52937-remove-feature-flag' into 'master' | Phil Hughes | 2018-11-12 | 6 | -66/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Removes feature flag for ciEnvironmentsStatusChanges | Filipa Lacerda | 2018-11-12 | 6 | -66/+2 |
|/ / / / | |||||
* | | | | Merge branch 'sh-bump-redis-store' into 'master' | Rémy Coutable | 2018-11-12 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Bump redis-store to 1.6.0sh-bump-redis-store | Stan Hu | 2018-11-10 | 2 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'sh-bump-mime-types' into 'master' | Rémy Coutable | 2018-11-12 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | MIME type application/javascript -> application/ecmascriptsh-bump-mime-types | Stan Hu | 2018-11-10 | 1 | -1/+1 |
| * | | | | Bump mime-types to 3.2.2 | Stan Hu | 2018-11-09 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master' | Douwe Maan | 2018-11-12 | 21 | -60/+1264 |
|\ \ \ \ | |||||
| * | | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flag | Oswaldo Ferreira | 2018-11-09 | 21 | -60/+1264 |
* | | | | | Merge branch 'patch-31' into 'master' | Stan Hu | 2018-11-12 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Set an empty entrypoint for license_management job | Philippe Lafoucrière | 2018-11-10 | 1 | -1/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'leipert-remove-unnecessary-dependencies' into 'master' | Rémy Coutable | 2018-11-12 | 1 | -3/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unnecessary job dependenciesleipert-remove-unnecessary-dependencies | Lukas Eipert | 2018-11-10 | 1 | -3/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'mr-tree-filter-path-name' into 'master' | Filipa Lacerda | 2018-11-12 | 3 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Changed diff tree filtering to path | Phil Hughes | 2018-11-12 | 3 | -2/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'discussion-perf-improvement' into 'master' | Filipa Lacerda | 2018-11-12 | 9 | -23/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvement | Phil Hughes | 2018-11-09 | 1 | -8/+11 |
| * | | | | | Fixed failing note actions spec | Phil Hughes | 2018-11-09 | 1 | -0/+3 |
| * | | | | | Init task list when creating new note & discussion | Phil Hughes | 2018-11-09 | 2 | -0/+2 |
| * | | | | | Fix TaskList init on update & poll | Phil Hughes | 2018-11-09 | 3 | -11/+10 |
| * | | | | | Improve initial rendering of discussion notes | Phil Hughes | 2018-11-09 | 5 | -13/+21 |
* | | | | | | Merge branch 'rails5-update-gemfile' into 'master' | Sean McGivern | 2018-11-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Upgrade whitequark/parser to 2.5.3.0 | Jan Provaznik | 2018-11-12 | 1 | -1/+1 |
* | | | | | | | Merge branch 'docs-dev-guidelines-update' into 'master' | Achilleas Pipinellis | 2018-11-12 | 3 | -319/+459 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Docs: updates docs development guidelines | Marcia Ramos | 2018-11-12 | 3 | -319/+459 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'docs/danger-documentation' into 'master' | Rémy Coutable | 2018-11-12 | 1 | -3/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Proper markdown table in docs Dangerfile | Achilleas Pipinellis | 2018-11-12 | 1 | -14/+16 |
| * | | | | | | | Edits to docs Dangerfiledocs/danger-documentation | Mike Lewis | 2018-11-09 | 1 | -10/+21 |
| * | | | | | | | Dangerbot: mention tech writers based on DevOps stage | Achilleas Pipinellis | 2018-11-09 | 1 | -3/+13 |
* | | | | | | | | Merge branch 'sh-bump-sidekiq' into 'master' | Sean McGivern | 2018-11-12 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Update gems in Gemfile.rails5.lock | Jan Provaznik | 2018-11-12 | 1 | -2/+2 |
| * | | | | | | | Bump Sidekiq and other related gems | Stan Hu | 2018-11-09 | 1 | -3/+3 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jprovazn-fix-status-spec' into 'master'qa-xss-in-mentions-test | Rémy Coutable | 2018-11-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix transient rspec issue | Jan Provaznik | 2018-11-12 | 1 | -3/+3 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'blackst0ne-add-discord-service' into 'master' | Sean McGivern | 2018-11-12 | 15 | -242/+374 |
|\ \ \ \ \ \ \ |