Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 1038 | -5839/+21076 |
|\ | |||||
| * | Merge branch 'fix-resolved-discussion' into 'master' | Filipa Lacerda | 2017-10-10 | 4 | -10/+6 |
| |\ | |||||
| | * | Fix unable to expand text diff discussion comments | Clement Ho | 2017-10-10 | 4 | -10/+6 |
| |/ | |||||
| * | Merge branch 'gitaly-0.45.1' into 'master' | Rémy Coutable | 2017-10-10 | 3 | -4/+4 |
| |\ | |||||
| | * | Fix mysterious rubocop failuregitaly-0.45.1 | Jacob Vosmaer | 2017-10-10 | 1 | -2/+2 |
| | * | Run bundle | Jacob Vosmaer | 2017-10-10 | 1 | -2/+2 |
| | * | Use gitaly-proto 0.41.0 | Jacob Vosmaer | 2017-10-10 | 1 | -1/+1 |
| | * | Use Gitaly 0.45.1 | Jacob Vosmaer | 2017-10-10 | 1 | -1/+1 |
| * | | Merge branch 'an/use-branch-exists-over-branch-names-include' into 'master' | Rémy Coutable | 2017-10-10 | 9 | -10/+15 |
| |\ \ | |||||
| | * | | Stop using `branch_names.include?` and use `branch_exists?` | Andrew Newdigate | 2017-10-10 | 9 | -10/+15 |
| |/ / | |||||
| * | | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-label | Phil Hughes | 2017-10-10 | 10 | -374/+321 |
| |\ \ | |||||
| | * | | Remove u2f from globalnamespace38869-u2f | Filipa Lacerda | 2017-10-09 | 10 | -374/+321 |
| * | | | Merge branch 'flash-es6-module' into 'master' | Filipa Lacerda | 2017-10-10 | 74 | -203/+454 |
| |\ \ \ | |||||
| | * | | | removed global eslint for remaining filesflash-es6-module | Phil Hughes | 2017-10-10 | 5 | -8/+0 |
| | * | | | fixed notes specs | Phil Hughes | 2017-10-10 | 3 | -13/+33 |
| | * | | | karma spec fixes | Phil Hughes | 2017-10-10 | 6 | -18/+13 |
| | * | | | fixed eslint | Phil Hughes | 2017-10-10 | 2 | -11/+10 |
| | * | | | flash tests | Phil Hughes | 2017-10-10 | 2 | -11/+282 |
| | * | | | spec fixes | Phil Hughes | 2017-10-10 | 3 | -8/+13 |
| | * | | | Flash is now a ES6 module | Phil Hughes | 2017-10-10 | 67 | -179/+148 |
| * | | | | Merge branch 'fix/skip-gitaly-mock-linting-error' into 'master' | Rémy Coutable | 2017-10-10 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix a liniting error introduced by !14652 | Ahmad Sherif | 2017-10-10 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' | Douwe Maan | 2017-10-10 | 15 | -18/+67 |
| |\ \ \ \ | |||||
| | * | | | | Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatible | Tim Zallmann | 2017-10-10 | 1 | -5/+1 |
| | * | | | | Fix for Lint Error + Upload Test | Tim Zallmann | 2017-10-09 | 2 | -2/+1 |
| | * | | | | Based on MR simplified the logic | Tim Zallmann | 2017-10-09 | 3 | -17/+5 |
| | * | | | | Removed 2 uncommented lines | Tim Zallmann | 2017-10-06 | 1 | -2/+0 |
| | * | | | | Fixed Linting Error | Tim Zallmann | 2017-10-05 | 1 | -8/+0 |
| | * | | | | Another Change for cleanup | Tim Zallmann | 2017-10-05 | 1 | -6/+0 |
| | * | | | | Updates based on MR comments | Tim Zallmann | 2017-10-05 | 3 | -16/+19 |
| | * | | | | Fixed Tests | Tim Zallmann | 2017-10-04 | 3 | -8/+9 |
| | * | | | | Fixed Test | Tim Zallmann | 2017-10-04 | 2 | -5/+4 |
| | * | | | | Fixed Linting errors + tests | Tim Zallmann | 2017-10-04 | 4 | -14/+13 |
| | * | | | | Created group_icon and group_icon_url | Tim Zallmann | 2017-10-04 | 12 | -17/+79 |
| | * | | | | Making private project avatars use local paths + Some Group Icons | Tim Zallmann | 2017-10-04 | 4 | -9/+27 |
| * | | | | | Merge branch '38941-lock-note-fix' into 'master' | Sean McGivern | 2017-10-10 | 3 | -3/+41 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix text for the merge request lock system note | Jarka Kadlecova | 2017-10-10 | 3 | -3/+41 |
| * | | | | | | Merge branch 'acet-fix-paste-on-comment-form' into 'master' | Filipa Lacerda | 2017-10-10 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Trigger change event of the markdown textarea to allow Vue catch the programm...acet-fix-paste-on-comment-form | Fatih Acet | 2017-09-27 | 1 | -1/+4 |
| * | | | | | | | Merge branch 'fix-timestampz-cop' into 'master' | Grzegorz Bizon | 2017-10-10 | 6 | -7/+43 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Ignore existing Migration/Datetime cop offenders | Sean McGivern | 2017-10-10 | 4 | -0/+4 |
| | * | | | | | | | Also warn on timestamp in datetime migration copfix-timestampz-cop | Sean McGivern | 2017-10-10 | 2 | -7/+39 |
| * | | | | | | | | Merge branch '38869-ci-global' into 'master' | Phil Hughes | 2017-10-10 | 10 | -121/+110 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Remove Build code from global namespace | Filipa Lacerda | 2017-10-10 | 10 | -121/+110 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into '... | Robert Speicher | 2017-10-10 | 3 | -22/+92 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitaly | Ahmad Sherif | 2017-10-09 | 3 | -22/+92 |
| * | | | | | | | Merge branch 'ee-38771-ce-backport' into 'master' | Douwe Maan | 2017-10-10 | 5 | -2/+52 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Backports EE 38771 changes to CE. | Tiago Botelho | 2017-10-10 | 5 | -2/+52 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch '38869-api' into 'master' | Phil Hughes | 2017-10-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove Api from main.js38869-api | Filipa Lacerda | 2017-10-09 | 1 | -1/+0 |
| | | |_|_|_|/ | | |/| | | | |