summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add a changelog entrybugfix.silence-on-disabled-notificationshttp://jneen.net/2017-08-111-0/+6
* switch to multi-line before blockhttp://jneen.net/2017-08-111-1/+3
* restructure the #new_key notification spechttp://jneen.net/2017-08-111-11/+6
* don't send devise notifications to the ghost userhttp://jneen.net/2017-08-111-0/+1
* reset_delivered_emails before testing #new_keyhttp://jneen.net/2017-08-111-0/+1
* skip the :read_project check for new_project_memberhttp://jneen.net/2017-08-112-2/+7
* move the member spec to be with the other oneshttp://jneen.net/2017-08-111-30/+52
* add a spec for new_group_memberhttp://jneen.net/2017-08-111-0/+30
* add a spec for never emailing the ghost userhttp://jneen.net/2017-08-111-0/+8
* rubocop fixhttp://jneen.net/2017-08-111-2/+1
* a membership with no user is always notifiablehttp://jneen.net/2017-08-113-6/+14
* check notifiability for more emailshttp://jneen.net/2017-08-112-15/+72
* add Member#notifiable?(type, opts)http://jneen.net/2017-08-113-0/+12
* make NotificationRecipient a little more customizablehttp://jneen.net/2017-08-111-3/+15
* Merge branch '36166_confi_polish_one' into 'master'Clement Ho2017-08-113-20/+5
|\
| * fix confidential border issue as well as confidential styles leaking on new MRRegis Boudinot2017-08-113-20/+5
|/
* Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-117-13/+24
|\
| * Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-117-13/+24
* | Merge branch 'import-project-modal-fix' into 'master'docs-group-milestonesFilipa Lacerda2017-08-111-1/+1
|\ \
| * | Fixes the correct import modal window not showingimport-project-modal-fixPhil Hughes2017-08-111-1/+1
* | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-1115-39/+210
|\ \ \
| * | | Add option to disable project export on instanceRobin Bobbitt2017-08-1113-38/+194
| * | | Add option to disable project export on instance - db changesRobin Bobbitt2017-08-112-1/+16
* | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-08-111-11/+7
|\ \ \ \
| * | | | Fix formatting of patch_versions.mdJan Bruckner2017-08-111-11/+7
* | | | | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-116-26/+25
|\ \ \ \ \
| * | | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-116-26/+25
* | | | | | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-118-48/+26
|\ \ \ \ \ \
| * | | | | | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-118-48/+26
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-116-8/+80
|\ \ \ \ \ \
| * | | | | | Better caching and indexing of broadcast messagesYorick Peterse2017-08-116-8/+80
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ...Sean McGivern2017-08-113-9/+20
|\ \ \ \ \ \
| * | | | | | Include the `is_admin` field in the `GET /users/:id` API when current user is...Rémy Coutable2017-08-113-9/+20
* | | | | | | Merge branch 'winh-git-revision-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-112-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Make Git revision dropdown style consistentwinh-git-revision-dropdown-stylewinh2017-08-092-4/+6
* | | | | | | | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' into...Douwe Maan2017-08-114-1/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Pending delete projects no longer return 500 error in Admins projects view35435-pending-delete-project-error-in-admin-interface-fixTiago Botelho2017-08-114-1/+23
* | | | | | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-1113-106/+706
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Document rspec-retry and rspec-flakyRémy Coutable2017-08-111-3/+20
| * | | | | | | | Fix cop descriptionRémy Coutable2017-08-111-3/+2
| * | | | | | | | Retrieve and sync flaky specs report from and to S3Rémy Coutable2017-08-113-88/+147
| * | | | | | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-118-12/+537
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-session-delete-challenge' into 'master'Robert Speicher2017-08-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Delete correct key from `session` after authenticating using U2Fdm-session-delete-challengeDouwe Maan2017-08-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1151-173/+2042
|\ \ \ \ \ \ \
| * | | | | | | Use a specialized class for querying eventsYorick Peterse2017-08-1012-17/+241
| * | | | | | | Migrate events into a new formatYorick Peterse2017-08-1041-157/+1802
* | | | | | | | Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-117-6/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-107-6/+98
* | | | | | | | | Merge branch '36174-show-error-message-for-500-in-tests' into 'master'Rémy Coutable2017-08-112-1/+18
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status