Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOG.md for 9.4.5 | James Edwards-Jones | 2017-08-14 | 19 | -73/+21 |
* | Merge branch 'zj-fix-charlock_holmes' into 'master' | Douwe Maan | 2017-08-14 | 1 | -1/+1 |
|\ | |||||
| * | Update charlock_holmeszj-fix-charlock_holmes | Zeger-Jan van de Weg | 2017-08-14 | 1 | -1/+1 |
* | | Merge branch '36133-project-overview-page-doesn-t-load-commit-metadata-for-re... | Tim Zallmann | 2017-08-14 | 1 | -0/+3 |
|\ \ | |||||
| * \ | Merge branch 'master' into '36133-project-overview-page-doesn-t-load-commit-m...36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view | Mike Greiling | 2017-08-10 | 218 | -778/+1763 |
| |\ \ | |||||
| * | | | fix commit metadata in project:show page | Mike Greiling | 2017-08-08 | 1 | -0/+3 |
* | | | | Merge branch 'user-edit-files-spec-fix' into 'master' | Tim Zallmann | 2017-08-14 | 1 | -0/+17 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Wait for requests to finish before running the ace JSuser-edit-files-spec-fix | Phil Hughes | 2017-08-09 | 1 | -0/+17 |
* | | | | Merge branch '36325-increase-z-index-pipeline-dropdown' into 'master' | Phil Hughes | 2017-08-14 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Increase z-index of pipeline dropdown36325-increase-z-index-pipeline-dropdown | Annabel Dunstone Gray | 2017-08-11 | 1 | -0/+1 |
* | | | | | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master' | Douwe Maan | 2017-08-14 | 25 | -524/+251 |
|\ \ \ \ \ | |||||
| * | | | | | Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespace | Bob Van Landuyt | 2017-08-11 | 4 | -4/+184 |
| * | | | | | Make sure uploads for personal snippets are correctly rendered | Bob Van Landuyt | 2017-08-11 | 8 | -22/+22 |
| * | | | | | Update migrations to move directly into the `-/system` folder | Bob Van Landuyt | 2017-08-11 | 11 | -8/+146 |
| * | | | | | Don't update upload paths twice | Bob Van Landuyt | 2017-08-11 | 2 | -110/+0 |
| * | | | | | Don't rename the system namespace | Bob Van Landuyt | 2017-08-11 | 3 | -485/+4 |
* | | | | | | Merge branch 'bugfix.silence-on-disabled-notifications' into 'master' | Douwe Maan | 2017-08-14 | 8 | -21/+179 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add a changelog entrybugfix.silence-on-disabled-notifications | http://jneen.net/ | 2017-08-11 | 1 | -0/+6 |
| * | | | | | | switch to multi-line before block | http://jneen.net/ | 2017-08-11 | 1 | -1/+3 |
| * | | | | | | restructure the #new_key notification spec | http://jneen.net/ | 2017-08-11 | 1 | -11/+6 |
| * | | | | | | don't send devise notifications to the ghost user | http://jneen.net/ | 2017-08-11 | 1 | -0/+1 |
| * | | | | | | reset_delivered_emails before testing #new_key | http://jneen.net/ | 2017-08-11 | 1 | -0/+1 |
| * | | | | | | skip the :read_project check for new_project_member | http://jneen.net/ | 2017-08-11 | 2 | -2/+7 |
| * | | | | | | move the member spec to be with the other ones | http://jneen.net/ | 2017-08-11 | 1 | -30/+52 |
| * | | | | | | add a spec for new_group_member | http://jneen.net/ | 2017-08-11 | 1 | -0/+30 |
| * | | | | | | add a spec for never emailing the ghost user | http://jneen.net/ | 2017-08-11 | 1 | -0/+8 |
| * | | | | | | rubocop fix | http://jneen.net/ | 2017-08-11 | 1 | -2/+1 |
| * | | | | | | a membership with no user is always notifiable | http://jneen.net/ | 2017-08-11 | 3 | -6/+14 |
| * | | | | | | check notifiability for more emails | http://jneen.net/ | 2017-08-11 | 2 | -15/+72 |
| * | | | | | | add Member#notifiable?(type, opts) | http://jneen.net/ | 2017-08-11 | 3 | -0/+12 |
| * | | | | | | make NotificationRecipient a little more customizable | http://jneen.net/ | 2017-08-11 | 1 | -3/+15 |
* | | | | | | | Merge branch 'sh-add-mysql-query-notes' into 'master' | Sid Sijbrandij | 2017-08-12 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add notes about database performance for MySQL | Stan Hu | 2017-08-11 | 1 | -0/+4 |
* | | | | | | | Merge branch '36166_confi_polish_one' into 'master' | Clement Ho | 2017-08-11 | 3 | -20/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix confidential border issue as well as confidential styles leaking on new MR | Regis Boudinot | 2017-08-11 | 3 | -20/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master' | Robert Speicher | 2017-08-11 | 7 | -13/+24 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitaly | Ahmad Sherif | 2017-08-11 | 7 | -13/+24 |
* | | | | | | | Merge branch 'import-project-modal-fix' into 'master'docs-group-milestones | Filipa Lacerda | 2017-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes the correct import modal window not showingimport-project-modal-fix | Phil Hughes | 2017-08-11 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'disable-project-export' into 'master' | Rémy Coutable | 2017-08-11 | 15 | -39/+210 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add option to disable project export on instance | Robin Bobbitt | 2017-08-11 | 13 | -38/+194 |
| * | | | | | | | | Add option to disable project export on instance - db changes | Robin Bobbitt | 2017-08-11 | 2 | -1/+16 |
* | | | | | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-08-11 | 1 | -11/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix formatting of patch_versions.md | Jan Bruckner | 2017-08-11 | 1 | -11/+7 |
* | | | | | | | | | | Merge branch 'rs-coverage-updates' into 'master' | Rémy Coutable | 2017-08-11 | 6 | -26/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Better categorize test coverage resultsrs-coverage-updates | Robert Speicher | 2017-08-11 | 6 | -26/+25 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '32004-use-timecop-safe-mode' into 'master' | Robert Speicher | 2017-08-11 | 8 | -48/+26 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Enable Timecop safe mode32004-use-timecop-safe-mode | Rémy Coutable | 2017-08-11 | 8 | -48/+26 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'broadcast-messages-cache' into 'master' | Sean McGivern | 2017-08-11 | 6 | -8/+80 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Better caching and indexing of broadcast messages | Yorick Peterse | 2017-08-11 | 6 | -8/+80 |
| | |_|/ / / / / / / | |/| | | | | | | | |