summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clarify location of Procfile for mail_roomdocs/clarify-mail-room-procfile-locationEric Eastwood2018-03-201-1/+1
* Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-1930-212/+807
|\
| * Show Ajax requests in performance barSean McGivern2018-03-1930-212/+807
* | Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' int...Robert Speicher2018-03-191-52/+56
|\ \
| * | [Rails5] Update active_record_locking initializerblackst0ne-rails5-update-active-record-locking-initializerblackst0ne2018-03-181-52/+56
* | | Merge branch 'api-delimiter' into 'master'Robert Speicher2018-03-194-39/+44
|\ \ \
| * | | Optional '/-/' delimiter for search APIJan Provaznik2018-03-194-39/+44
| | |/ | |/|
* | | Merge branch 'jl-add-custom-metrics-docs' into 'master'Marcia Ramos2018-03-191-13/+17
|\ \ \
| * | | Minor updatesjl-add-custom-metrics-docsJoshua Lambert2018-03-181-13/+17
* | | | Merge branch '43933-always-notify-mentions' into 'master'Sean McGivern2018-03-193-4/+26
|\ \ \ \
| * | | | Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentionsMario de la Ossa2018-03-193-4/+26
* | | | | Merge branch '44383-cleanup-framework-header' into 'master'Phil Hughes2018-03-192-56/+57
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Clean up selectors in framework/header.scssTakuya Noguchi2018-03-202-56/+57
* | | | | Merge branch '44330-docs-for-ingress-ip' into 'master'Achilleas Pipinellis2018-03-192-0/+34
|\ \ \ \ \
| * | | | | Document static IP and DNS configuration for KubernetesAchilleas Pipinellis2018-03-191-7/+23
| * | | | | Add documentation for displayed K8s Ingress IP address (#44330)44330-docs-for-ingress-ipDylan Griffith2018-03-192-0/+18
| | |_|/ / | |/| | |
* | | | | Merge branch 'update-google-api-client' into 'master'Robert Speicher2018-03-192-5/+5
|\ \ \ \ \
| * | | | | Update google-api-clientPirate Praveen2018-03-162-5/+5
* | | | | | Merge branch '44384-cleanup-css-for-nested-lists' into 'master'Filipa Lacerda2018-03-192-6/+5
|\ \ \ \ \ \
| * | | | | | Unify format for nested non-task listsTakuya Noguchi2018-03-182-6/+5
* | | | | | | Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'Robert Speicher2018-03-192-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Remove N+1 queries in /admin/projects pageStan Hu2018-03-192-0/+11
| |/ / / / / /
* | | | | | | Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master'Clement Ho2018-03-197-26/+39
|\ \ \ \ \ \ \
| * | | | | | | Move ShaMismatch vue componentGeorge Tsiolis2018-03-197-26/+39
* | | | | | | | Merge branch 'sh-fix-failure-project-destroy' into 'master'Robert Speicher2018-03-192-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix "Can't modify frozen hash" error when project is destroyedsh-fix-failure-project-destroyStan Hu2018-03-162-1/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'update-doorkeeper-openid_connect' into 'master'Douwe Maan2018-03-192-12/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Update doorkeeper-openid_connect and doorkeeperPirate Praveen2018-03-162-12/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'remove-oj' into 'master'Robert Speicher2018-03-192-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove oj as we're not using itLin Jen-Shin2018-03-192-5/+0
* | | | | | | | | Merge branch '43928-merge-request-comment-gets-cleared-once-the-previous-comm...Filipa Lacerda2018-03-191-9/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Notes karma specs failing"Simon Knox2018-03-191-9/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'update-omniauth-saml' into 'master'Douwe Maan2018-03-192-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Relax omniauth-samlPirate Praveen2018-03-152-2/+2
* | | | | | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern2018-03-1919-8/+383
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add spec for concurrent insert situation.31114-internal-ids-are-not-atomicAndreas Brandl2018-03-181-0/+13
| * | | | | | | | Replace public_send calls.Andreas Brandl2018-03-181-3/+3
| * | | | | | | | Address review comments.Andreas Brandl2018-03-166-19/+22
| * | | | | | | | Only support single scope argument.Andreas Brandl2018-03-161-4/+2
| * | | | | | | | Simplify migration and add NOT NULL to project_id.Andreas Brandl2018-03-162-20/+4
| * | | | | | | | Address review comments.Andreas Brandl2018-03-162-17/+15
| * | | | | | | | Add new model to import/export configuration.Andreas Brandl2018-03-161-0/+1
| * | | | | | | | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-163-2/+46
| * | | | | | | | Backwards-compat for migration specs.Andreas Brandl2018-03-162-4/+35
| * | | | | | | | Add changelog.Andreas Brandl2018-03-161-0/+5
| * | | | | | | | Use bigserial for internal_ids table.Andreas Brandl2018-03-162-2/+2
| * | | | | | | | Add bigserial as a native database type for MySQL adapterDouglas Barbosa Alexandre2018-03-161-0/+11
| * | | | | | | | Refactor, extract class and improve comments.Andreas Brandl2018-03-165-43/+95
| * | | | | | | | More flexible way of internal id generation.Andreas Brandl2018-03-165-49/+42
| * | | | | | | | Atomic generation of internal ids for issues.Andreas Brandl2018-03-168-1/+243