| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove global dropdown shortcut from help modal39111-remove-n-shortcut | Annabel Dunstone Gray | 2017-10-13 | 1 | -4/+0 |
| | | |||||
| * | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master' | Sean McGivern | 2017-10-13 | 11 | -11/+227 |
| |\ | | | | | | | | | added date parameter for time tracking See merge request gitlab-org/gitlab-ce!14866 | ||||
| | * | added date parameter for time trackinggitlab-ee-1312-time-spent-at | Vlad | 2017-10-13 | 11 | -11/+227 |
| | | | |||||
| * | | Merge branch '39096-upgrade-vuex' into 'master' | Phil Hughes | 2017-10-13 | 2 | -4/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | Update Vuex version Closes #39096 See merge request gitlab-org/gitlab-ce!14868 | ||||
| | * | | Update Vuex version39096-upgrade-vuex | Filipa Lacerda | 2017-10-13 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master' | Rémy Coutable | 2017-10-13 | 8 | -27/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory Closes #37571 See merge request gitlab-org/gitlab-ce!14850 | ||||
| | * | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory | Jacopo | 2017-10-13 | 8 | -27/+12 |
| | | | | | | | | | | | | | | | | | We replace the usage of WikiPage::CreateService with the wiki_page factory in the specs. | ||||
| * | | | | Merge branch 'gitaly-merge' into 'master' | Sean McGivern | 2017-10-13 | 9 | -17/+143 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Merge Requests via Gitaly Closes gitaly#654 See merge request gitlab-org/gitlab-ce!14791 | ||||
| | * | | | | Merge Merge Requests via Gitaly | Jacob Vosmaer | 2017-10-13 | 9 | -17/+143 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'grpc-1.6.6' into 'master' | Rémy Coutable | 2017-10-13 | 1 | -1/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use grpc 1.6.6 See merge request gitlab-org/gitlab-ce!14821 | ||||
| | * | | | | Use grpc 1.6.6 | Jacob Vosmaer | 2017-10-13 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'server-flash-click-remove' into 'master' | Filipa Lacerda | 2017-10-13 | 3 | -2/+34 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Fixed server rendered flash not being removed on click See merge request gitlab-org/gitlab-ce!14864 | ||||
| | * | | | | Fixed server rendered flash not being removed on clickserver-flash-click-remove | Phil Hughes | 2017-10-13 | 3 | -2/+34 |
| | | | | | | |||||
| * | | | | | Merge branch 'backport-ee-2869' into 'master' | Sean McGivern | 2017-10-13 | 3 | -16/+34 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | backport for gitlab-ee!2869 See merge request gitlab-org/gitlab-ce!14505 | ||||
| | * | | | | backport for gitlab-ee!2869backport-ee-2869 | Simon Knox | 2017-10-13 | 3 | -16/+34 |
| | | | | | | |||||
| * | | | | | Merge branch 'google-protobuf-3.4.1.1' into 'master' | Rémy Coutable | 2017-10-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use google-protobuf 3.4.1.1 See merge request gitlab-org/gitlab-ce!14820 | ||||
| | * | | | | | Use google-protobuf 3.4.1.1google-protobuf-3.4.1.1 | Jacob Vosmaer | 2017-10-11 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master' | Sean McGivern | 2017-10-13 | 5 | -2/+46 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "merge ongoing" check more consistent Closes #39032 See merge request gitlab-org/gitlab-ce!14825 | ||||
| | * | | | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistency | Oswaldo Ferreira | 2017-10-13 | 4 | -3/+22 |
| | | | | | | | |||||
| | * | | | | | Make "merge ongoing" check more consistent | Oswaldo Ferreira | 2017-10-11 | 3 | -2/+27 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'es-module-broadcast_message' into 'master' | Phil Hughes | 2017-10-13 | 4 | -26/+29 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor broadcast_message.js See merge request gitlab-org/gitlab-ce!14853 | ||||
| | * | | | | | | Refactor broadcast_message.js | Mike Greiling | 2017-10-13 | 4 | -26/+29 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '38869-members' into 'master' | Phil Hughes | 2017-10-13 | 4 | -120/+110 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Removes Members, memberExpiration from window object See merge request gitlab-org/gitlab-ce!14808 | ||||
| | * | | | | | Remove members and memberExpirationDate from window object38869-members | Filipa Lacerda | 2017-10-12 | 4 | -120/+110 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'revert-8ae7963c' into 'master' | Rémy Coutable | 2017-10-13 | 2 | -6/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '36160-select2-dropdown' into 'master'" See merge request gitlab-org/gitlab-ce!14851 | ||||
| | * | | | | | | Revert "Merge branch '36160-select2-dropdown' into 'master'"revert-8ae7963c | Filipa Lacerda | 2017-10-12 | 2 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !14768 | ||||
| * | | | | | | | Merge branch 'fix-cursor-path' into 'master' | Tim Zallmann | 2017-10-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use image-url instead of url so that asset pipeline can do it's thing Closes #38980 See merge request gitlab-org/gitlab-ce!14799 | ||||
| | * | | | | | | Use image-url instead of url so that asset pipeline can do it's thingfix-cursor-path | Clement Ho | 2017-10-10 | 1 | -2/+2 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge branch 'evn-add-profiler' into 'master' | Stan Hu | 2017-10-12 | 1 | -0/+10 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to gitlab-profiler See merge request gitlab-org/gitlab-ce!14775 | ||||
| | * | | | | | | Different wording to make it more generalevn-add-profiler | ernstvn | 2017-10-09 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Add link to gitlab-profiler | ernstvn | 2017-10-09 | 1 | -0/+10 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'new-mr-repo-editor' into 'master' | Clement Ho | 2017-10-12 | 11 | -68/+260 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add create merge checkbox. Closes #38626 See merge request gitlab-org/gitlab-ce!14665 | ||||
| | * | | | | | | | Add create merge checkbox. | Jacob Schatz | 2017-10-12 | 11 | -68/+260 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master' | Kamil Trzciński | 2017-10-12 | 3 | -4/+68 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab admin Closes #26763 and #18392 See merge request gitlab-org/gitlab-ce!14751 | ||||
| | * | | | | | | | fix code style issues | Vratislav Kalenda | 2017-10-10 | 1 | -2/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | fill in changelog entry | Vratislav Kalenda | 2017-10-10 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | refactor access handling | Vratislav Kalenda | 2017-10-10 | 1 | -5/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | fix lint | Vratislav Kalenda | 2017-10-08 | 1 | -6/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | remove whitespace | Vratislav Kalenda | 2017-10-08 | 2 | -4/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab admin | Vratislav Kalenda | 2017-10-08 | 3 | -0/+55 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'update-licenses.csv' into 'master' | Rémy Coutable | 2017-10-12 | 1 | -102/+52 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update dependencies license list See merge request gitlab-org/gitlab-ce!14845 | ||||
| | * | | | | | | | Update licenses | Lin Jen-Shin | 2017-10-12 | 1 | -102/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followed the command from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-4-update-the-dependencies-license-list bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv | ||||
| * | | | | | | | | Merge branch 'fix/rugged-alternate-paths' into 'master' | Douwe Maan | 2017-10-12 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the format of rugged alternate directory list Closes #39046 See merge request gitlab-org/gitlab-ce!14840 | ||||
| | * | | | | | | | | Fix the format of rugged alternate directory listfix/rugged-alternate-paths | Ahmad Sherif | 2017-10-12 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #39046 | ||||
| * | | | | | | | | | Merge branch '34897-delete-branch-after-merge' into 'master' | Sean McGivern | 2017-10-12 | 4 | -14/+38 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "remove source branch" checkbox from merge widget being ignored Closes #34897 See merge request gitlab-org/gitlab-ce!14832 | ||||
| | * | | | | | | | | | fix a whitespace34897-delete-branch-after-merge | Micael Bergeron | 2017-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix for discussion | Micael Bergeron | 2017-10-12 | 1 | -3/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | [ci-skip] add changelog | micael.bergeron | 2017-10-11 | 1 | -0/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix the merger override to remove source branch | micael.bergeron | 2017-10-11 | 1 | -5/+8 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | add spec | micael.bergeron | 2017-10-11 | 2 | -7/+22 |
| | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |