| Commit message (Expand) | Author | Age | Files | Lines |
* | Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolation | Robert Speicher | 2016-10-03 | 11 | -14/+13 |
* | Merge branch 'zj-grape-award-emoji' into 'master'
| Robert Speicher | 2016-10-03 | 1 | -33/+31 |
|\ |
|
| * | GrapeDSL for Award Emoji endpointszj-grape-award-emoji | Z.J. van de Weg | 2016-10-03 | 1 | -33/+31 |
* | | Merge branch 'fix/import-export-admin' into 'master'
| Robert Speicher | 2016-10-03 | 6 | -9/+7 |
|\ \ |
|
| * | | Enable import/export back for non-adminsfix/import-export-admin | James Lopez | 2016-10-03 | 6 | -9/+7 |
* | | | Merge branch 'use-custom-ruby-images' into 'master'
| Rémy Coutable | 2016-10-03 | 3 | -19/+3 |
|\ \ \ |
|
| * | | | Move the images over to dev.gitlab.orguse-custom-ruby-images | Z.J. van de Weg | 2016-09-30 | 2 | -3/+3 |
| * | | | Update CI yaml and update CHANGELOG entry | Z.J. van de Weg | 2016-09-30 | 2 | -3/+3 |
| * | | | Set CHANGELOG item to right release | Z.J. van de Weg | 2016-09-30 | 1 | -1/+1 |
| * | | | remove unused cache from .gitlab-ci.yml | Z.J. van de Weg | 2016-09-30 | 1 | -2/+0 |
| * | | | Use custom Ruby images to test builds | Kamil Trzcinski | 2016-09-30 | 3 | -17/+3 |
* | | | | Merge branch 'group-empty-state' into 'master'
| Jacob Schatz | 2016-10-03 | 5 | -6/+52 |
|\ \ \ \ |
|
| * | | | | Updated artwork of empty group state.group-empty-state | Fatih Acet | 2016-10-03 | 1 | -1/+1 |
| * | | | | Better empty state for Groups view. | Fatih Acet | 2016-10-03 | 5 | -6/+52 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'rs-convert-ssh-key-features' into 'master'
| Robert Speicher | 2016-10-03 | 3 | -70/+43 |
|\ \ \ \ |
|
| * | | | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-features | Robert Speicher | 2016-10-03 | 3 | -70/+43 |
| |/ / / |
|
* | | | | Merge branch 'zj-grape-keys' into 'master'
| Rémy Coutable | 2016-10-03 | 1 | -4/+3 |
|\ \ \ \ |
|
| * | | | | GrapeDSL for Keys endpointzj-grape-keys | Z.J. van de Weg | 2016-10-01 | 1 | -4/+3 |
* | | | | | Merge branch 'update-gitlab-shell-3-6-3' into 'master'
| Rémy Coutable | 2016-10-03 | 2 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | Update gitlab-shell to 3.6.3 | Rémy Coutable | 2016-10-03 | 2 | -2/+2 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'fix-sidebar' into 'master'
| Dmitriy Zaporozhets | 2016-10-03 | 3 | -9/+9 |
|\ \ \ \ \ |
|
| * | | | | | Fixes sidebar navigation.fix-sidebar | Fatih Acet | 2016-10-03 | 3 | -9/+9 |
| |/ / / / |
|
* | | | | | Merge branch '21225-wip-slash-command-for-mrs' into 'master'
| Rémy Coutable | 2016-10-03 | 12 | -16/+196 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Add a /wip slash command | Thomas Balthazar | 2016-10-03 | 12 | -16/+196 |
* | | | | | Merge branch 'fix-broken-access_requests_finder_spec' into 'master'
| Robert Speicher | 2016-10-03 | 2 | -3/+3 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Members::RequestAccessService is tricter on permissions | Rémy Coutable | 2016-10-03 | 2 | -3/+3 |
|/ / / / |
|
* | | | | Merge branch '22851-keep-scroll-location-when-collapsing-sidebar' into 'master'
| Dmitriy Zaporozhets | 2016-10-03 | 2 | -5/+8 |
|\ \ \ \ |
|
| * | | | | Fix page scrolling to top on sidebar toggle | Luke Howell | 2016-10-01 | 2 | -5/+8 |
* | | | | | Merge branch 'document-need-owner-or-master-permission-for-initial-push' into... | Dmitriy Zaporozhets | 2016-10-03 | 1 | -0/+2 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | updated missed indentation | Pierre-Alexandre Clorichel | 2016-09-30 | 1 | -1/+1 |
| * | | | | document the need to be owner or have the master permission level for the ini... | Pierre-Alexandre Clorichel | 2016-09-30 | 1 | -0/+2 |
* | | | | | Merge branch 'patch-5' into 'master'
| Rémy Coutable | 2016-10-03 | 2 | -1/+2 |
|\ \ \ \ \ |
|
| * | | | | | Fixes #22499 | Gal Schlezinger | 2016-09-29 | 2 | -1/+2 |
* | | | | | | Merge branch '22773-add-comparison-link-to-system-note' into 'master'
| Dmitriy Zaporozhets | 2016-10-03 | 4 | -8/+38 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-note | Matthew Dodds | 2016-10-01 | 1 | -4/+0 |
| * | | | | | | Add a spec to verify comparison context inclusion in path when a version is c... | Matthew Dodds | 2016-10-01 | 1 | -2/+13 |
| * | | | | | | Refactor url_helpers for system note service and remove duplication of logic ... | Matthew Dodds | 2016-09-30 | 2 | -18/+13 |
| * | | | | | | Add link to comparison from system note, update changelog | Matthew Dodds | 2016-09-29 | 3 | -4/+32 |
* | | | | | | | Merge branch 'link-to-downtime-requires-from-migration-style-guide' into 'mas... | Achilleas Pipinellis | 2016-10-02 | 1 | -4/+4 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Link to the "What requires downtime?" page from the Migration Style Guide | Nick Thomas | 2016-10-02 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'fix-issue-title-wrap' into 'master'
| Annabel Dunstone Gray | 2016-10-02 | 3 | -0/+3 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Add word-wrap to issue title on issue and milestone boards | Clement Ho | 2016-10-01 | 3 | -0/+3 |
| | |_|_|_|/ / /
| |/| | | | | | |
|
* | | | | | | | | Fix RuboCop failure in app/services/notification_service.rb | Robert Speicher | 2016-10-02 | 1 | -2/+7 |
* | | | | | | | | Merge branch 'jimmykarily/gitlab-ce-notify_current_user_when_merging_an_mr_af... | Robert Speicher | 2016-10-02 | 3 | -5/+24 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Notify current_user about automatic merge after successful build | Dimitris Karakasilis | 2016-09-29 | 3 | -5/+24 |
* | | | | | | | | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have... | Robert Speicher | 2016-10-02 | 25 | -219/+431 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Use the new Members::ApproveAccessRequestService in Member#add_user21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access | Rémy Coutable | 2016-09-28 | 1 | -1/+1 |
| * | | | | | | | | | Allow Member.add_user to handle access requesters | Rémy Coutable | 2016-09-28 | 25 | -219/+431 |
* | | | | | | | | | | Merge branch 'rc-new-members-request-access-service' into 'master'
| Robert Speicher | 2016-10-02 | 9 | -14/+107 |
|\ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | Use AccessRequestable#request_access in MembershipActionsrc-new-members-request-access-service | Rémy Coutable | 2016-09-22 | 2 | -2/+2 |