summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | resolve duplicated changelog entryFu Xu2016-10-031-1/+0
| * | | | | | | | credit myself :smile:Fu Xu2016-10-031-0/+1
| * | | | | | | | change determine conditionsFu Xu2016-10-032-2/+2
| * | | | | | | | override subject method in devise mailerFu Xu2016-10-032-1/+10
| * | | | | | | | follow the styleguide: Don't use parentheses around a literalFu Xu2016-10-031-1/+1
| * | | | | | | | wrap subject with method subjectFu Xu2016-10-031-1/+1
| * | | | | | | | move spec back into shared example `an email sent from GitLab`Fu Xu2016-10-032-7/+10
| * | | | | | | | stub config settings in specFu Xu2016-10-031-5/+2
| * | | | | | | | remove empty line at block body endFu Xu2016-10-031-1/+0
| * | | | | | | | remove extra entryFu Xu2016-10-031-3/+0
| * | | | | | | | create new test in `spec/mailers/notify_spec.rb`Fu Xu2016-10-032-4/+11
| * | | | | | | | move changelog to 8.13Fu Xu2016-10-031-1/+1
| * | | | | | | | add configurable email subject suffixFu Xu2016-10-036-9/+22
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' Rémy Coutable2016-10-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | aiionx_sidekiq_log_patchDavid2016-04-151-1/+1
* | | | | | | | | Merge branch '22466-task-list-fork' into 'master' Rémy Coutable2016-10-034-52/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Remove the task_list test since it is patched upstreamJared Deckard2016-09-301-16/+0
| * | | | | | | | Align gem version stringsJared Deckard2016-09-301-10/+10
| * | | | | | | | Replace talk_list patch with a patched forkJared Deckard2016-09-303-26/+6
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status