summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove disabled Performance/PushSplat coprs-remove-pushsplat-copRobert Speicher2016-10-031-5/+0
* Merge branch 'zj-grape-award-emoji' into 'master' Robert Speicher2016-10-031-33/+31
|\
| * GrapeDSL for Award Emoji endpointszj-grape-award-emojiZ.J. van de Weg2016-10-031-33/+31
* | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-036-9/+7
|\ \
| * | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-036-9/+7
* | | Merge branch 'use-custom-ruby-images' into 'master' Rémy Coutable2016-10-033-19/+3
|\ \ \
| * | | Move the images over to dev.gitlab.orguse-custom-ruby-imagesZ.J. van de Weg2016-09-302-3/+3
| * | | Update CI yaml and update CHANGELOG entryZ.J. van de Weg2016-09-302-3/+3
| * | | Set CHANGELOG item to right releaseZ.J. van de Weg2016-09-301-1/+1
| * | | remove unused cache from .gitlab-ci.ymlZ.J. van de Weg2016-09-301-2/+0
| * | | Use custom Ruby images to test buildsKamil Trzcinski2016-09-303-17/+3
* | | | Merge branch 'group-empty-state' into 'master' Jacob Schatz2016-10-035-6/+52
|\ \ \ \
| * | | | Updated artwork of empty group state.group-empty-stateFatih Acet2016-10-031-1/+1
| * | | | Better empty state for Groups view.Fatih Acet2016-10-035-6/+52
| | |/ / | |/| |
* | | | Merge branch 'rs-convert-ssh-key-features' into 'master' Robert Speicher2016-10-033-70/+43
|\ \ \ \
| * | | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-featuresRobert Speicher2016-10-033-70/+43
| |/ / /
* | | | Merge branch 'zj-grape-keys' into 'master' Rémy Coutable2016-10-031-4/+3
|\ \ \ \
| * | | | GrapeDSL for Keys endpointzj-grape-keysZ.J. van de Weg2016-10-011-4/+3
* | | | | Merge branch 'update-gitlab-shell-3-6-3' into 'master' Rémy Coutable2016-10-032-2/+2
|\ \ \ \ \
| * | | | | Update gitlab-shell to 3.6.3Rémy Coutable2016-10-032-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-sidebar' into 'master' Dmitriy Zaporozhets2016-10-033-9/+9
|\ \ \ \ \
| * | | | | Fixes sidebar navigation.fix-sidebarFatih Acet2016-10-033-9/+9
| |/ / / /
* | | | | Merge branch '21225-wip-slash-command-for-mrs' into 'master' Rémy Coutable2016-10-0312-16/+196
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a /wip slash commandThomas Balthazar2016-10-0312-16/+196
* | | | | Merge branch 'fix-broken-access_requests_finder_spec' into 'master' Robert Speicher2016-10-032-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Members::RequestAccessService is tricter on permissionsRémy Coutable2016-10-032-3/+3
|/ / / /
* | | | Merge branch '22851-keep-scroll-location-when-collapsing-sidebar' into 'master' Dmitriy Zaporozhets2016-10-032-5/+8
|\ \ \ \
| * | | | Fix page scrolling to top on sidebar toggleLuke Howell2016-10-012-5/+8
* | | | | Merge branch 'document-need-owner-or-master-permission-for-initial-push' into...Dmitriy Zaporozhets2016-10-031-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | updated missed indentationPierre-Alexandre Clorichel2016-09-301-1/+1
| * | | | document the need to be owner or have the master permission level for the ini...Pierre-Alexandre Clorichel2016-09-301-0/+2
* | | | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-10-032-1/+2
|\ \ \ \ \
| * | | | | Fixes #22499Gal Schlezinger2016-09-292-1/+2
* | | | | | Merge branch '22773-add-comparison-link-to-system-note' into 'master' Dmitriy Zaporozhets2016-10-034-8/+38
|\ \ \ \ \ \
| * | | | | | Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-noteMatthew Dodds2016-10-011-4/+0
| * | | | | | Add a spec to verify comparison context inclusion in path when a version is c...Matthew Dodds2016-10-011-2/+13
| * | | | | | Refactor url_helpers for system note service and remove duplication of logic ...Matthew Dodds2016-09-302-18/+13
| * | | | | | Add link to comparison from system note, update changelogMatthew Dodds2016-09-293-4/+32
* | | | | | | Merge branch 'link-to-downtime-requires-from-migration-style-guide' into 'mas...Achilleas Pipinellis2016-10-021-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Link to the "What requires downtime?" page from the Migration Style GuideNick Thomas2016-10-021-4/+4
* | | | | | | | Merge branch 'fix-issue-title-wrap' into 'master' Annabel Dunstone Gray2016-10-023-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add word-wrap to issue title on issue and milestone boardsClement Ho2016-10-013-0/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Fix RuboCop failure in app/services/notification_service.rbRobert Speicher2016-10-021-2/+7
* | | | | | | | Merge branch 'jimmykarily/gitlab-ce-notify_current_user_when_merging_an_mr_af...Robert Speicher2016-10-023-5/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Notify current_user about automatic merge after successful buildDimitris Karakasilis2016-09-293-5/+24
* | | | | | | | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-0225-219/+431
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use the new Members::ApproveAccessRequestService in Member#add_user21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-accessRémy Coutable2016-09-281-1/+1
| * | | | | | | | | Allow Member.add_user to handle access requestersRémy Coutable2016-09-2825-219/+431
* | | | | | | | | | Merge branch 'rc-new-members-request-access-service' into 'master' Robert Speicher2016-10-029-14/+107
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Use AccessRequestable#request_access in MembershipActionsrc-new-members-request-access-serviceRémy Coutable2016-09-222-2/+2
View Lorry Controller Status