summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* moved timeout to a variablefly-out-tunnelPhil Hughes2017-08-141-4/+8
* fixed up specs caused by left over elements in the bodyPhil Hughes2017-08-142-4/+5
* fixed JS error when no sidebar existsPhil Hughes2017-08-141-0/+3
* Add dynamic navigation tunnel to fly-out menusPhil Hughes2017-08-143-69/+247
* Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-1425-524/+251
|\
| * Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-114-4/+184
| * Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-118-22/+22
| * Update migrations to move directly into the `-/system` folderBob Van Landuyt2017-08-1111-8/+146
| * Don't update upload paths twiceBob Van Landuyt2017-08-112-110/+0
| * Don't rename the system namespaceBob Van Landuyt2017-08-113-485/+4
* | Merge branch 'bugfix.silence-on-disabled-notifications' into 'master'Douwe Maan2017-08-148-21/+179
|\ \
| * | 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 'sh-add-mysql-query-notes' into 'master'Sid Sijbrandij2017-08-121-0/+4
|\ \ \ | |/ / |/| |
| * | Add notes about database performance for MySQLStan Hu2017-08-111-0/+4
* | | 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
View Lorry Controller Status