Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Exclude comments under /universitydocs/no-comments | Achilleas Pipinellis | 2017-11-01 | 30 | -0/+120 |
* | Exclude comments under /update | Achilleas Pipinellis | 2017-11-01 | 67 | -0/+268 |
* | Merge branch 'backport-workhorse-show-all-refs' into 'master' | Douwe Maan | 2017-11-01 | 4 | -5/+25 |
|\ | |||||
| * | Support show-all-refs for git over HTTP | Nick Thomas | 2017-10-30 | 4 | -5/+25 |
* | | Merge branch '39628-bug-in-the-procedure-advised-from-ee_compat_check' into '... | Sean McGivern | 2017-11-01 | 2 | -15/+16 |
|\ \ | |||||
| * | | Ensure the ee-compat-check uses the correct patch URL for forks39628-bug-in-the-procedure-advised-from-ee_compat_check | Rémy Coutable | 2017-10-31 | 2 | -15/+16 |
* | | | Merge branch 'lazy-load-check-when-has-images' into 'master' | Filipa Lacerda | 2017-11-01 | 1 | -8/+7 |
|\ \ \ | |||||
| * | | | Increase lazy loader performancelazy-load-check-when-has-images | Phil Hughes | 2017-10-31 | 1 | -8/+7 |
* | | | | Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master' | Sean McGivern | 2017-11-01 | 6 | -33/+157 |
|\ \ \ \ | |||||
| * | | | | Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitaly | Ahmad Sherif | 2017-10-31 | 6 | -33/+157 |
* | | | | | Merge branch 'rc-qa-mattermost-login' into 'master' | Grzegorz Bizon | 2017-11-01 | 7 | -0/+107 |
|\ \ \ \ \ | |||||
| * | | | | | Add tests for mattermost login via oauth | Richard Clamp | 2017-10-30 | 6 | -0/+61 |
| * | | | | | Add spec for QA::Scenario::Entrypoint | Richard Clamp | 2017-10-25 | 1 | -0/+46 |
* | | | | | | Merge branch 'go-get-ssh' into 'master' | Douwe Maan | 2017-11-01 | 3 | -55/+103 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Returns a ssh url for go-get=1 | Guilherme Vieira | 2017-10-31 | 3 | -55/+103 |
* | | | | | | | Merge branch '39633-convert-fuzzaldrin-plus-js-library-to-be-a-yarn-managed-l... | Phil Hughes | 2017-11-01 | 7 | -1164/+8 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library" | Tim Zallmann | 2017-11-01 | 7 | -1164/+8 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-31 | 4 | -25/+110 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitaly | Ahmad Sherif | 2017-10-31 | 4 | -25/+110 |
* | | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master' | Sean McGivern | 2017-10-31 | 9 | -12/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Normalize LDAP DN when looking up identity | Douwe Maan | 2017-10-31 | 9 | -12/+35 |
* | | | | | | | | Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master' | Rémy Coutable | 2017-10-31 | 3 | -3/+8 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Bump carrierwave to 1.2.1 | Takuya Noguchi | 2017-10-30 | 3 | -3/+8 |
* | | | | | | | | Merge branch 'multi-file-editor-vuex' into 'master' | Filipa Lacerda | 2017-10-31 | 63 | -2447/+1826 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixed up upload feature after master mergemulti-file-editor-vuex | Phil Hughes | 2017-10-31 | 7 | -46/+64 |
| * | | | | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-31 | 21 | -264/+283 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | get branch name from the DOM | Phil Hughes | 2017-10-31 | 2 | -2/+4 |
| * | | | | | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-31 | 66 | -750/+695 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | spec fixes | Phil Hughes | 2017-10-31 | 3 | -2/+7 |
| * | | | | | | | | | | spec fixes | Phil Hughes | 2017-10-30 | 7 | -13/+19 |
| * | | | | | | | | | | addressed feedback from review | Phil Hughes | 2017-10-30 | 19 | -74/+93 |
| * | | | | | | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-30 | 132 | -524/+2018 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | updated karma specs | Phil Hughes | 2017-10-27 | 27 | -1030/+612 |
| * | | | | | | | | | | | reset hash when changing files | Phil Hughes | 2017-10-26 | 2 | -2/+3 |
| * | | | | | | | | | | | various different performance improvements | Phil Hughes | 2017-10-26 | 10 | -37/+24 |
| * | | | | | | | | | | | fixed render_error not being hooked up correctly | Phil Hughes | 2017-10-26 | 5 | -34/+9 |
| * | | | | | | | | | | | fixed some state bugs with the tabs | Phil Hughes | 2017-10-26 | 10 | -38/+53 |
| * | | | | | | | | | | | correctly activate the next tab when closing a tab | Phil Hughes | 2017-10-26 | 3 | -3/+28 |
| * | | | | | | | | | | | moved new file/directory into new store | Phil Hughes | 2017-10-26 | 19 | -692/+176 |
| * | | | | | | | | | | | [WIP] Move multi-file editor store to Vuex | Phil Hughes | 2017-10-26 | 33 | -584/+910 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master' | Sean McGivern | 2017-10-31 | 4 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Be able to bundle gems with newer rubieszj/gitlab-ce-zj-ruby-2.3.5 | Zeger-Jan van de Weg | 2017-10-31 | 1 | -1/+1 |
| * | | | | | | | | | | | Upgrade Ruby to 2.3.5 | Zeger-Jan van de Weg | 2017-10-31 | 4 | -5/+10 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'docs/improve-maintenance' into 'master' | Stan Hu | 2017-10-31 | 1 | -13/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Improve the maintenance policy page | Rémy Coutable | 2017-10-31 | 1 | -13/+18 |
* | | | | | | | | | | | | Merge branch '23206-load-participants-async' into 'master' | Phil Hughes | 2017-10-31 | 45 | -205/+911 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Load participants async | Eric Eastwood | 2017-10-31 | 45 | -205/+911 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'fix/import-issue-assignees' into 'master' | Sean McGivern | 2017-10-31 | 7 | -1/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | add changelog | James Lopez | 2017-10-31 | 1 | -0/+5 |
| * | | | | | | | | | | | fix spec failure | James Lopez | 2017-10-31 | 1 | -0/+3 |